Skip to content

Commit 8beb603

Browse files
authored
op-e2e: cleanup unused MessageExpiryTime from interop recipe (ethereum-optimism#14634)
1 parent 502f002 commit 8beb603

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

op-chain-ops/interopgen/recipe.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ import (
1313
)
1414

1515
type InteropDevRecipe struct {
16-
L1ChainID uint64
17-
L2ChainIDs []uint64
18-
GenesisTimestamp uint64
19-
MessageExpiryTime uint64
16+
L1ChainID uint64
17+
L2ChainIDs []uint64
18+
GenesisTimestamp uint64
2019
}
2120

2221
func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error) {
@@ -90,7 +89,7 @@ func (r *InteropDevRecipe) Build(addrs devkeys.Addresses) (*WorldConfig, error)
9089
L2s: make(map[string]*L2Config),
9190
}
9291
for _, l2ChainID := range r.L2ChainIDs {
93-
l2Cfg, err := InteropL2DevConfig(r.L1ChainID, l2ChainID, addrs, r.MessageExpiryTime)
92+
l2Cfg, err := InteropL2DevConfig(r.L1ChainID, l2ChainID, addrs)
9493
if err != nil {
9594
return nil, fmt.Errorf("failed to generate L2 config for chain %d: %w", l2ChainID, err)
9695
}
@@ -126,7 +125,7 @@ func prefundL2Accounts(l1Cfg *L1Config, l2Cfg *L2Config, addrs devkeys.Addresses
126125
return nil
127126
}
128127

129-
func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses, messageExpiryTime uint64) (*L2Config, error) {
128+
func InteropL2DevConfig(l1ChainID, l2ChainID uint64, addrs devkeys.Addresses) (*L2Config, error) {
130129
// Padded chain ID, hex encoded, prefixed with 0xff like inboxes, then 0x02 to signify devnet.
131130
batchInboxAddress := common.HexToAddress(fmt.Sprintf("0xff02%016x", l2ChainID))
132131
chainOps := devkeys.ChainOperatorKeys(new(big.Int).SetUint64(l2ChainID))

op-e2e/actions/interop/dsl/interop.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,9 @@ func SetupInterop(t helpers.Testing) *InteropSetup {
108108
logger := testlog.Logger(t, log.LevelDebug)
109109

110110
recipe := interopgen.InteropDevRecipe{
111-
L1ChainID: 900100,
112-
L2ChainIDs: []uint64{900200, 900201},
113-
GenesisTimestamp: uint64(time.Now().Unix() + 3),
114-
MessageExpiryTime: messageExpiryTime,
111+
L1ChainID: 900100,
112+
L2ChainIDs: []uint64{900200, 900201},
113+
GenesisTimestamp: uint64(time.Now().Unix() + 3),
115114
}
116115
hdWallet, err := devkeys.NewMnemonicDevKeys(devkeys.TestMnemonic)
117116
require.NoError(t, err)

0 commit comments

Comments
 (0)