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

Fix Shanghai tests parsing #63

Merged
merged 5 commits into from
Jun 18, 2024
Merged

Fix Shanghai tests parsing #63

merged 5 commits into from
Jun 18, 2024

Conversation

Nashtare
Copy link
Contributor

Since ethereum/tests#1380, all tests prior to Cancun have been migrated to the LegacyTests repo, which makes the current parser unable to process tests for Shanghai.

@Nashtare Nashtare requested a review from BGluth June 14, 2024 18:34
@Nashtare Nashtare self-assigned this Jun 14, 2024
pub(crate) const TEST_GROUPS: [&str; 1] = ["GeneralStateTests"];
// The following subgroups contain subfolders unlike the other test folders.
pub(crate) const SPECIAL_TEST_SUBGROUPS: [&str; 3] = ["Cancun", "Shanghai", "VMTests"];
pub(crate) const SPECIAL_TEST_SUBGROUPS: [&str; 2] = ["Shanghai", "VMTests"];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are actually no _Shanghai tests in the Cancun folder so it can be simply removed.

@Nashtare Nashtare added the bug Something isn't working label Jun 14, 2024
@@ -1,4 +1,4 @@
pub const GENERATION_INPUTS_DEFAULT_OUTPUT_DIR: &str = "generation_inputs";
pub const MAIN_TEST_DIR: &str = "BlockchainTests";
pub const MAIN_TEST_DIR: &str = "Cancun/BlockchainTests";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The name may be confusing, but it's implying all tests until Cancun included.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add a comment to explain what MAIN_TEST_DIR corresponds to then?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah it might be worth a comment just explaining that a sub-group is now the main sub-group, but I'm good either way.

@Nashtare
Copy link
Contributor Author

@BGluth Thought it'd be nice to have some coverage results at each new version (similarly to what Hermez does, though we have a different coverage base). I've kicked off a job for all (including heavy) tests, will open a PR to update the README once he finishes.

Copy link
Contributor

@LindaGuiga LindaGuiga left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@@ -1,4 +1,4 @@
pub const GENERATION_INPUTS_DEFAULT_OUTPUT_DIR: &str = "generation_inputs";
pub const MAIN_TEST_DIR: &str = "BlockchainTests";
pub const MAIN_TEST_DIR: &str = "Cancun/BlockchainTests";
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we add a comment to explain what MAIN_TEST_DIR corresponds to then?

eth_test_parser/src/config.rs Outdated Show resolved Hide resolved
Co-authored-by: Linda Guiga <[email protected]>
@Nashtare
Copy link
Contributor Author

Should we add a comment to explain what MAIN_TEST_DIR corresponds to then?

I'm not sure what you mean by that @LindaGuiga, could you clarify?

Copy link
Contributor

@BGluth BGluth left a comment

Choose a reason for hiding this comment

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

Yeah LGTM!

@@ -1,4 +1,4 @@
pub const GENERATION_INPUTS_DEFAULT_OUTPUT_DIR: &str = "generation_inputs";
pub const MAIN_TEST_DIR: &str = "BlockchainTests";
pub const MAIN_TEST_DIR: &str = "Cancun/BlockchainTests";
Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah it might be worth a comment just explaining that a sub-group is now the main sub-group, but I'm good either way.

@Nashtare Nashtare merged commit 3db50d3 into main Jun 18, 2024
2 checks passed
@Nashtare Nashtare deleted the fix/legacy branch June 20, 2024 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants