Skip to content

Commit f6a1547

Browse files
geokneegeoknee
committed
loop l1 genesis flag into check on flag compatibility
1 parent 3e93a5e commit f6a1547

File tree

2 files changed

+116
-58
lines changed

2 files changed

+116
-58
lines changed

‎op-challenger/cmd/main_test.go‎

Lines changed: 46 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func TestAsteriscBaseRequiredArgs(t *testing.T) {
584584
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
585585
verifyArgsInvalid(
586586
t,
587-
"flag network can not be used with rollup-config, l2-genesis or asterisc-kona-l2-custom",
587+
"flag network can not be used with rollup-config, l2-genesis, asterisc-kona-l2-custom or l1-genesis",
588588
addRequiredArgs(traceType, "--rollup-config=rollup.json"))
589589
})
590590

@@ -657,22 +657,26 @@ func TestCannonCustomConfigArgs(t *testing.T) {
657657
t.Run(fmt.Sprintf("TestRequireEitherCannonNetworkOrRollupAndGenesis-%v", traceType), func(t *testing.T) {
658658
verifyArgsInvalid(
659659
t,
660-
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
660+
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
661661
addRequiredArgsExcept(traceType, "--network"))
662662
verifyArgsInvalid(
663663
t,
664-
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
665-
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json"))
664+
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
665+
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json"))
666+
verifyArgsInvalid(
667+
t,
668+
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
669+
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-l1-genesis=l1-genesis.json"))
666670
verifyArgsInvalid(
667671
t,
668-
"flag network or rollup-config/cannon-rollup-config and l2-genesis/cannon-l2-genesis is required",
669-
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json"))
672+
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and l1-genesis/cannon-l1-genesis is required",
673+
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l1-genesis=l1-genesis.json"))
670674
})
671675

672676
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
673677
verifyArgsInvalid(
674678
t,
675-
"flag network can not be used with cannon-rollup-config, l2-genesis or cannon-l2-custom",
679+
"flag network can not be used with cannon-rollup-config, l2-genesis, cannon-l2-custom or l1-genesis",
676680
addRequiredArgs(traceType, "--cannon-rollup-config=rollup.json"))
677681
})
678682

@@ -686,14 +690,14 @@ func TestCannonCustomConfigArgs(t *testing.T) {
686690
args["--cannon-l2-custom"] = "true"
687691
verifyArgsInvalid(
688692
t,
689-
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
693+
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis, cannon-l2-custom or l1-genesis",
690694
toArgList(args))
691695
})
692696

693697
t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
694698
t.Run("NotRequiredWhenRollupAndGenesIsSpecified", func(t *testing.T) {
695699
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
696-
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
700+
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
697701
})
698702

699703
t.Run("Valid", func(t *testing.T) {
@@ -706,6 +710,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
706710
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
707711
"--cannon-rollup-config=rollup.json",
708712
"--cannon-l2-genesis=genesis.json",
713+
"--cannon-l1-genesis=l1-genesis.json",
709714
"--cannon-l2-custom"))
710715
require.True(t, cfg.Cannon.L2Custom)
711716
})
@@ -716,7 +721,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
716721
})
717722

718723
t.Run("Valid", func(t *testing.T) {
719-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
724+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
720725
require.Equal(t, []string{"rollup.json"}, cfg.Cannon.RollupConfigPaths)
721726
})
722727
})
@@ -727,7 +732,7 @@ func TestCannonCustomConfigArgs(t *testing.T) {
727732
})
728733

729734
t.Run("Valid", func(t *testing.T) {
730-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json"))
735+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-l1-genesis=l1-genesis.json"))
731736
require.Equal(t, []string{"genesis.json"}, cfg.Cannon.L2GenesisPaths)
732737
})
733738
})
@@ -739,7 +744,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
739744
traceType := traceType
740745

741746
t.Run(fmt.Sprintf("TestRequireEitherCannonNetworkOrRollupAndGenesisAndDepset-%v", traceType), func(t *testing.T) {
742-
expectedErrorMessage := "flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and depset-config/cannon-depset-config is required"
747+
expectedErrorMessage := "flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis, depset-config/cannon-depset-config and l1-genesis/cannon-l1-genesis is required"
743748
// Missing all
744749
verifyArgsInvalid(
745750
t,
@@ -749,23 +754,28 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
749754
verifyArgsInvalid(
750755
t,
751756
expectedErrorMessage,
752-
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-depset-config=depset.json"))
757+
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
753758
// Missing rollup-config
754759
verifyArgsInvalid(
755760
t,
756761
expectedErrorMessage,
757-
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json"))
762+
addRequiredArgsExcept(traceType, "--network", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
758763
// Missing depset-config
759764
verifyArgsInvalid(
760765
t,
761766
expectedErrorMessage,
762-
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json"))
767+
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json", "--cannon-l1-genesis=l1-genesis.json"))
768+
// Missing l1-genesis
769+
verifyArgsInvalid(
770+
t,
771+
expectedErrorMessage,
772+
addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=gensis.json", "--cannon-depset-config=depset.json"))
763773
})
764774

765775
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
766776
verifyArgsInvalid(
767777
t,
768-
"flag network can not be used with cannon-rollup-config, l2-genesis or cannon-l2-custom",
778+
"flag network can not be used with cannon-rollup-config, l2-genesis, cannon-l2-custom or l1-genesis",
769779
addRequiredArgs(traceType, "--cannon-rollup-config=rollup.json"))
770780
})
771781

@@ -779,14 +789,14 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
779789
args["--cannon-l2-custom"] = "true"
780790
verifyArgsInvalid(
781791
t,
782-
"flag network can not be used with cannon-rollup-config, cannon-l2-genesis or cannon-l2-custom",
792+
"failed to setup: flag network can not be used with cannon-rollup-config, cannon-l2-genesis, cannon-l2-custom or l1-genesis",
783793
toArgList(args))
784794
})
785795

786796
t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
787797
t.Run("NotRequiredWhenRollupGenesisAndDepsetIsSpecified", func(t *testing.T) {
788798
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
789-
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
799+
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
790800
})
791801

792802
t.Run("Valid", func(t *testing.T) {
@@ -800,7 +810,8 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
800810
"--cannon-rollup-config=rollup.json",
801811
"--cannon-l2-genesis=genesis.json",
802812
"--cannon-depset-config=depset.json",
803-
"--cannon-l2-custom"))
813+
"--cannon-l2-custom",
814+
"--cannon-l1-genesis=l1-genesis.json"))
804815
require.True(t, cfg.Cannon.L2Custom)
805816
})
806817

@@ -811,7 +822,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
811822

812823
t.Run("Valid", func(t *testing.T) {
813824
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
814-
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
825+
"--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
815826
require.Equal(t, []string{"rollup.json"}, cfg.Cannon.RollupConfigPaths)
816827
})
817828
})
@@ -822,7 +833,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
822833
})
823834

824835
t.Run("Valid", func(t *testing.T) {
825-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
836+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
826837
require.Equal(t, []string{"genesis.json"}, cfg.Cannon.L2GenesisPaths)
827838
})
828839
})
@@ -833,7 +844,7 @@ func TestSuperCannonCustomConfigArgs(t *testing.T) {
833844
})
834845

835846
t.Run("Valid", func(t *testing.T) {
836-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json"))
847+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--cannon-rollup-config=rollup.json", "--cannon-l2-genesis=genesis.json", "--cannon-depset-config=depset.json", "--cannon-l1-genesis=l1-genesis.json"))
837848
require.Equal(t, "depset.json", cfg.Cannon.DepsetConfigPath)
838849
})
839850
})
@@ -845,7 +856,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
845856
traceType := traceType
846857

847858
t.Run(fmt.Sprintf("TestRequireEitherAsteriscKonaNetworkOrRollupAndGenesisAndDepset-%v", traceType), func(t *testing.T) {
848-
expectedErrorMessage := "flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis and depset-config/asterisc-kona-depset-config is required"
859+
expectedErrorMessage := "flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis, depset-config/asterisc-kona-depset-config and l1-genesis/asterisc-kona-l1-genesis is required"
849860
// Missing all
850861
verifyArgsInvalid(
851862
t,
@@ -871,7 +882,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
871882
t.Run(fmt.Sprintf("TestMustNotSpecifyNetworkAndRollup-%v", traceType), func(t *testing.T) {
872883
verifyArgsInvalid(
873884
t,
874-
"flag network can not be used with asterisc-kona-rollup-config, l2-genesis or asterisc-kona-l2-custom",
885+
"flag network can not be used with asterisc-kona-rollup-config, l2-genesis, asterisc-kona-l2-custom or l1-genesis",
875886
addRequiredArgs(traceType, "--asterisc-kona-rollup-config=rollup.json"))
876887
})
877888

@@ -883,16 +894,17 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
883894
args["--asterisc-kona-rollup-config"] = "rollup.json"
884895
args["--asterisc-kona-l2-genesis"] = "gensis.json"
885896
args["--asterisc-kona-l2-custom"] = "true"
897+
args["--asterisc-kona-l1-genesis"] = "l1-genesis.json"
886898
verifyArgsInvalid(
887899
t,
888-
"flag network can not be used with asterisc-kona-rollup-config, asterisc-kona-l2-genesis or asterisc-kona-l2-custom",
900+
"flag network can not be used with asterisc-kona-rollup-config, asterisc-kona-l2-genesis, asterisc-kona-l2-custom or asterisc-kona-l1-genesis",
889901
toArgList(args))
890902
})
891903

892904
t.Run(fmt.Sprintf("TestNetwork-%v", traceType), func(t *testing.T) {
893905
t.Run("NotRequiredWhenRollupGenesisAndDepsetIsSpecified", func(t *testing.T) {
894906
configForArgs(t, addRequiredArgsExcept(traceType, "--network",
895-
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
907+
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
896908
})
897909

898910
t.Run("Valid", func(t *testing.T) {
@@ -906,7 +918,8 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
906918
"--asterisc-kona-rollup-config=rollup.json",
907919
"--asterisc-kona-l2-genesis=genesis.json",
908920
"--asterisc-kona-depset-config=depset.json",
909-
"--asterisc-kona-l2-custom"))
921+
"--asterisc-kona-l2-custom",
922+
"--asterisc-kona-l1-genesis=l1-genesis.json"))
910923
require.True(t, cfg.AsteriscKona.L2Custom)
911924
})
912925

@@ -917,7 +930,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
917930

918931
t.Run("Valid", func(t *testing.T) {
919932
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network",
920-
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
933+
"--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
921934
require.Equal(t, []string{"rollup.json"}, cfg.AsteriscKona.RollupConfigPaths)
922935
})
923936
})
@@ -928,7 +941,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
928941
})
929942

930943
t.Run("Valid", func(t *testing.T) {
931-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
944+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
932945
require.Equal(t, []string{"genesis.json"}, cfg.AsteriscKona.L2GenesisPaths)
933946
})
934947
})
@@ -939,7 +952,7 @@ func TestSuperAsteriscKonaCustomConfigArgs(t *testing.T) {
939952
})
940953

941954
t.Run("Valid", func(t *testing.T) {
942-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json"))
955+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--asterisc-kona-rollup-config=rollup.json", "--asterisc-kona-l2-genesis=genesis.json", "--asterisc-kona-depset-config=depset.json", "--asterisc-kona-l1-genesis=l1-genesis.json"))
943956
require.Equal(t, "depset.json", cfg.AsteriscKona.DepsetConfigPath)
944957
})
945958
})
@@ -1090,18 +1103,18 @@ func TestDepsetConfig(t *testing.T) {
10901103
if traceType == types.TraceTypeSuperCannon || traceType == types.TraceTypeSuperPermissioned {
10911104
t.Run("Required-"+traceType.String(), func(t *testing.T) {
10921105
verifyArgsInvalid(t,
1093-
"flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis and depset-config/cannon-depset-config is required",
1106+
"failed to setup: flag network or rollup-config/cannon-rollup-config, l2-genesis/cannon-l2-genesis, depset-config/cannon-depset-config and l1-genesis/cannon-l1-genesis is required",
10941107
addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
10951108
})
10961109
} else if traceType == types.TraceTypeSuperAsteriscKona {
10971110
t.Run("Required-"+traceType.String(), func(t *testing.T) {
10981111
verifyArgsInvalid(t,
1099-
"flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis and depset-config/asterisc-kona-depset-config is required",
1112+
"failed to setup: flag network or rollup-config/asterisc-kona-rollup-config, l2-genesis/asterisc-kona-l2-genesis, depset-config/asterisc-kona-depset-config and l1-genesis/asterisc-kona-l1-genesis is required",
11001113
addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
11011114
})
11021115
} else {
11031116
t.Run("NotRequired-"+traceType.String(), func(t *testing.T) {
1104-
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json"))
1117+
cfg := configForArgs(t, addRequiredArgsExcept(traceType, "--network", "--rollup-config=rollup.json", "--l2-genesis=genesis.json", "--l1-genesis=l1-genesis.json"))
11051118
require.Equal(t, "", cfg.Cannon.DepsetConfigPath)
11061119
})
11071120
}

0 commit comments

Comments
 (0)