@@ -19,23 +19,16 @@ func TestValidation(t *testing.T) {
1919}
2020
2121func testValidation (t * testing.T , chain * ChainConfig ) {
22- t .Run ("Universal Checks" , func (t * testing.T ) {
23- testUniversal (t , chain )
24- })
25-
26- t .Run ("Standard Chain" , func (t * testing.T ) {
27- if chain .SuperchainLevel != Standard {
28- t .Skip ("Chain excluded from this check (NOT a Standard Chain)" )
29- }
30- testStandard (t , chain )
31- })
22+ testUniversal (t , chain )
3223
33- t .Run ("Standard or Standard Candidate Chain" , func (t * testing.T ) {
34- if ! chain .StandardChainCandidate && chain .SuperchainLevel != Standard {
35- t .Skip ("Chain excluded from this check (NOT a Standard or a Standard Candidate Chain)" )
36- }
24+ if chain .SuperchainLevel == Standard ||
25+ (chain .SuperchainLevel == Frontier && chain .StandardChainCandidate ) {
3726 testStandardCandidate (t , chain )
38- })
27+ }
28+
29+ if chain .SuperchainLevel == Standard {
30+ testStandard (t , chain )
31+ }
3932}
4033
4134// testUniversal should be applied to each chain in the registry
@@ -60,18 +53,17 @@ func testUniversal(t *testing.T, chain *ChainConfig) {
6053
6154// testStandardCandidate applies to Standard and Standard Candidate Chains.
6255func testStandardCandidate (t * testing.T , chain * ChainConfig ) {
63- t .Run ("Standard Config Params" , func (t * testing.T ) {
64- t .Run ("Data Availability" , func (t * testing.T ) { testDataAvailability (t , chain ) })
65- t .Run ("Resource Config" , func (t * testing.T ) { testResourceConfig (t , chain ) })
66- t .Run ("L2OO Params" , func (t * testing.T ) { testL2OOParams (t , chain ) })
67- t .Run ("Gas Limit" , func (t * testing.T ) { testGasLimit (t , chain ) })
68- t .Run ("GPO Params" , func (t * testing.T ) { testGasPriceOracleParams (t , chain ) })
69- t .Run ("Superchain Config" , func (t * testing.T ) { testSuperchainConfig (t , chain ) })
70- })
71- t .Run ("Standard Config Roles" , func (t * testing.T ) {
72- t .Run ("L1 Security Config" , func (t * testing.T ) { testL1SecurityConfig (t , chain .ChainID ) })
73- t .Run ("L2 Security Config" , func (t * testing.T ) { testL2SecurityConfig (t , chain ) })
74- })
56+ // Standard Config Params
57+ t .Run ("Data Availability" , func (t * testing.T ) { testDataAvailability (t , chain ) })
58+ t .Run ("Resource Config" , func (t * testing.T ) { testResourceConfig (t , chain ) })
59+ t .Run ("L2OO Params" , func (t * testing.T ) { testL2OOParams (t , chain ) })
60+ t .Run ("Gas Limit" , func (t * testing.T ) { testGasLimit (t , chain ) })
61+ t .Run ("GPO Params" , func (t * testing.T ) { testGasPriceOracleParams (t , chain ) })
62+ t .Run ("Superchain Config" , func (t * testing.T ) { testSuperchainConfig (t , chain ) })
63+ // Standard Config Roles
64+ t .Run ("L1 Security Config" , func (t * testing.T ) { testL1SecurityConfig (t , chain .ChainID ) })
65+ t .Run ("L2 Security Config" , func (t * testing.T ) { testL2SecurityConfig (t , chain ) })
66+ // Standard Contract Versions
7567 t .Run ("Standard Contract Versions" , func (t * testing.T ) {
7668 testContractsMatchATag (t , chain )
7769 })
0 commit comments