op-node: fix ChannelTimeoutGranite setting and tests

ethereum-optimism · Aug 12, 2024 · 5f2ce28 · 5f2ce28
1 parent dc6759b
commit 5f2ce28
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/op-node/chaincfg/chains_test.go b/op-node/chaincfg/chains_test.go
@@ -92,7 +92,7 @@ var sepoliaCfg = rollup.Config{
 	MaxSequencerDrift:       600,
 	SeqWindowSize:           3600,
 	ChannelTimeoutBedrock:   300,
-	ChannelTimeoutGranite:   0,
+	ChannelTimeoutGranite:   50,
 	L1ChainID:               big.NewInt(11155111),
 	L2ChainID:               big.NewInt(11155420),
 	BatchInboxAddress:       common.HexToAddress("0xff00000000000000000000000000000011155420"),
@@ -129,7 +129,7 @@ var sepoliaDev0Cfg = rollup.Config{
 	MaxSequencerDrift:       600,
 	SeqWindowSize:           3600,
 	ChannelTimeoutBedrock:   300,
-	ChannelTimeoutGranite:   0,
+	ChannelTimeoutGranite:   50,
 	L1ChainID:               big.NewInt(11155111),
 	L2ChainID:               big.NewInt(11155421),
 	BatchInboxAddress:       common.HexToAddress("0xff00000000000000000000000000000011155421"),

diff --git a/op-node/rollup/superchain.go b/op-node/rollup/superchain.go
@@ -88,7 +88,7 @@ func LoadOPStackRollupConfig(chainID uint64) (*Config, error) {
 		cfg.ChannelTimeoutBedrock = *chConfig.ChannelTimeoutBedrock
 	}
 	if chConfig.ChannelTimeoutGranite != nil {
-		cfg.ChannelTimeoutBedrock = *chConfig.ChannelTimeoutGranite
+		cfg.ChannelTimeoutGranite = *chConfig.ChannelTimeoutGranite
 	}
 
 	if superChain.Config.ProtocolVersionsAddr != nil { // Set optional protocol versions address

diff --git a/op-node/rollup/types_test.go b/op-node/rollup/types_test.go
@@ -397,7 +397,7 @@ func TestConfig_Check(t *testing.T) {
 				cfg.FjordTime = &genesis
 				cfg.GraniteTime = &genesis
 			},
-			expectedErr: ErrMissingChannelTimeoutBedrock,
+			expectedErr: ErrMissingChannelTimeoutGranite,
 		},
 		{
 			name:        "SeqWindowSizeZero",