Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Schedule Goerli shanghaiTime and configure forkId for tests #5151

Merged
merged 2 commits into from
Mar 3, 2023

Conversation

siladu
Copy link
Contributor

@siladu siladu commented Mar 2, 2023

Announced here: ethereum/execution-specs#724

Still waiting for confirmation of the forkId hash.

Marius confirmed:

I can confirm 0xf9843abf with 1678832736

Sepolia change for comparison: 5452159

I could update ForkIdsNetworkConfigTest but Goerli hasn't been kept up to date for that test since Istanbul. I checked code coverage and I don't believe that test is providing any extra value beyond what ForkIdTest is already doing. I would suggest we remove ForkIdsNetworkConfigTest and the unnecessary parts of ForkIdTestUtil. Would like some feedback from @jframe about that first though.

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
@siladu siladu self-assigned this Mar 2, 2023
@siladu siladu added TeamGroot GH issues worked on by Groot Team mainnet EIP Ethereum Improvement Proposal labels Mar 2, 2023
@jframe
Copy link
Contributor

jframe commented Mar 3, 2023

The ForkIdsNetworkConfigTest was last updated for London for Goerli so it has been kept up to date.

I think still makes sense to keep it. It tests that the configuration in the network json file is correct. Whereas the ForkIdTest is testing the forkId logic against milestones defined in the ForkIdTestUtil. So it's possible that without the ForkIdsNetworkConfigTest we wouldn't know if the values in the network json file are incorrect.

Copy link
Contributor

@jframe jframe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@siladu
Copy link
Contributor Author

siladu commented Mar 3, 2023

The ForkIdsNetworkConfigTest was last updated for London for Goerli so it has been kept up to date.

I think still makes sense to keep it. It tests that the configuration in the network json file is correct. Whereas the ForkIdTest is testing the forkId logic against milestones defined in the ForkIdTestUtil. So it's possible that without the ForkIdsNetworkConfigTest we wouldn't know if the values in the network json file are incorrect.

@jframe Got my test names mixed up, switch ForkIdsNetworkConfigTest for ForkIdTest w.r.t not being updated since Istanbul...I updated ForkIdsNetworkConfigTest in this PR so that is the one I was suggesting we keep. But...I also mixed them up when I ran the coverage, so actually yes ForkIdTest is covering more of the code than ForkIdsNetworkConfigTest.

Since not convinced by the value of adding Goerli config to it though, is there any in your opinion?

@jframe
Copy link
Contributor

jframe commented Mar 3, 2023

The ForkIdsNetworkConfigTest was last updated for London for Goerli so it has been kept up to date.
I think still makes sense to keep it. It tests that the configuration in the network json file is correct. Whereas the ForkIdTest is testing the forkId logic against milestones defined in the ForkIdTestUtil. So it's possible that without the ForkIdsNetworkConfigTest we wouldn't know if the values in the network json file are incorrect.

@jframe Got my test names mixed up, switch ForkIdsNetworkConfigTest for ForkIdTest w.r.t not being updated since Istanbul...I updated ForkIdsNetworkConfigTest in this PR so that is the one I was suggesting we keep. But...I also mixed them up when I ran the coverage, so actually yes ForkIdTest is covering more of the code than ForkIdsNetworkConfigTest.

Since not convinced by the value of adding Goerli config to it though, is there any in your opinion?

ForkIdTest covers a lot more cases so we should definitely keep that. If we were to load the network configuration from the json files instead from the predefined values in ForkIdTestUtil then there would be no need for both test classes we could just have the ForkIdTest. Which would be a lot better. This would be better to do in another PR though.

As for the value of adding Goerli config to the ForkIdTest there isn't much value in that since we have already effectively tested that in ForkIdsNetworkConfigTest.

@siladu siladu enabled auto-merge (squash) March 3, 2023 18:52
@siladu siladu merged commit d48403d into hyperledger:main Mar 3, 2023
@siladu siladu deleted the goerli-shanghaitime branch March 3, 2023 19:14
elenduuche pushed a commit to elenduuche/besu that referenced this pull request Aug 16, 2023
…ger#5151)

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
…ger#5151)

Signed-off-by: Simon Dudley <simon.dudley@consensys.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EIP Ethereum Improvement Proposal mainnet TeamGroot GH issues worked on by Groot Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants