op-challenger: Do not allow both cannon and outputCannon trace types to be enabled

op-challenger/config/config.go

@@ -34,6 +34,7 @@ var (
 	ErrCannonNetworkAndL2Genesis     = errors.New("only specify one of network or l2 genesis path")
 	ErrCannonNetworkUnknown          = errors.New("unknown cannon network")
 	ErrMissingRollupRpc              = errors.New("missing rollup rpc url")
+	ErrCannonAndOutputCannonConflict = errors.New("trace types cannon and outputCannon cannot be enabled at the same time")
 )
 
 type TraceType string
@@ -187,6 +188,9 @@ func (c Config) Check() error {
 			return ErrMissingRollupRpc
 		}
 	}
+	if c.TraceTypeEnabled(TraceTypeCannon) && c.TraceTypeEnabled(TraceTypeOutputCannon) {
+		return ErrCannonAndOutputCannonConflict
+	}
 	if c.TraceTypeEnabled(TraceTypeCannon) || c.TraceTypeEnabled(TraceTypeOutputCannon) {
 		if c.CannonBin == "" {
 			return ErrMissingCannonBin

op-challenger/config/config_test.go

@@ -135,6 +135,12 @@ func TestRollupRpcRequired(t *testing.T) {
 	require.ErrorIs(t, config.Check(), ErrMissingRollupRpc)
 }
 
+func TestCannotEnableBothCannonAndOutputCannonTraceTypes(t *testing.T) {
+	config := validConfig(TraceTypeOutputCannon)
+	config.TraceTypes = append(config.TraceTypes, TraceTypeCannon)
+	require.ErrorIs(t, config.Check(), ErrCannonAndOutputCannonConflict)
+}
+
 func TestCannonL2Required(t *testing.T) {
 	config := validConfig(TraceTypeCannon)
 	config.CannonL2 = ""
@@ -195,19 +201,14 @@ func TestNetworkMustBeValid(t *testing.T) {
 	require.ErrorIs(t, cfg.Check(), ErrCannonNetworkUnknown)
 }
 
-func TestRequireConfigForAllSupportedTraceTypes(t *testing.T) {
+func TestRequireConfigForMultipleTraceTypes(t *testing.T) {
 	cfg := validConfig(TraceTypeCannon)
-	cfg.TraceTypes = []TraceType{TraceTypeCannon, TraceTypeOutputCannon, TraceTypeAlphabet}
+	cfg.TraceTypes = []TraceType{TraceTypeCannon, TraceTypeAlphabet}
 	// Set all required options and check its valid
 	cfg.RollupRpc = validRollupRpc
 	cfg.AlphabetTrace = validAlphabetTrace
 	require.NoError(t, cfg.Check())
 
-	// Require output cannon specific args
-	cfg.RollupRpc = ""
-	require.ErrorIs(t, cfg.Check(), ErrMissingRollupRpc)
-	cfg.RollupRpc = validRollupRpc
-
 	// Require cannon specific args
 	cfg.CannonL2 = ""
 	require.ErrorIs(t, cfg.Check(), ErrMissingCannonL2)