Commit 3d19b6d2 authored by Adrian Sutton's avatar Adrian Sutton

op-e2e: Integrate LoadPersisted call into e2e code

parent 02116fa5
...@@ -548,6 +548,9 @@ func (cfg SystemConfig) Start(_opts ...SystemConfigOption) (*System, error) { ...@@ -548,6 +548,9 @@ func (cfg SystemConfig) Start(_opts ...SystemConfigOption) (*System, error) {
nodeConfig := cfg.Nodes[name] nodeConfig := cfg.Nodes[name]
c := *nodeConfig // copy c := *nodeConfig // copy
c.Rollup = makeRollupConfig() c.Rollup = makeRollupConfig()
if err := c.LoadPersisted(cfg.Loggers[name]); err != nil {
return nil, err
}
if p, ok := p2pNodes[name]; ok { if p, ok := p2pNodes[name]; ok {
c.P2P = p c.P2P = p
......
...@@ -8,9 +8,7 @@ import ( ...@@ -8,9 +8,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/client" "github.com/ethereum-optimism/optimism/op-node/client"
"github.com/ethereum-optimism/optimism/op-node/node" "github.com/ethereum-optimism/optimism/op-node/node"
"github.com/ethereum-optimism/optimism/op-node/sources" "github.com/ethereum-optimism/optimism/op-node/sources"
"github.com/ethereum-optimism/optimism/op-node/testlog"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
...@@ -99,10 +97,8 @@ func TestLoadSequencerStateOnStarted_Stopped(t *testing.T) { ...@@ -99,10 +97,8 @@ func TestLoadSequencerStateOnStarted_Stopped(t *testing.T) {
cfg := DefaultSystemConfig(t) cfg := DefaultSystemConfig(t)
// We don't need a verifier - just the sequencer is enough // We don't need a verifier - just the sequencer is enough
delete(cfg.Nodes, "verifier") delete(cfg.Nodes, "verifier")
logger := testlog.Logger(t, log.LvlInfo)
seqCfg := cfg.Nodes["sequencer"] seqCfg := cfg.Nodes["sequencer"]
seqCfg.ConfigPersistence = node.NewConfigPersistence(stateFile) seqCfg.ConfigPersistence = node.NewConfigPersistence(stateFile)
require.NoError(t, seqCfg.LoadPersisted(logger))
sys, err := cfg.Start() sys, err := cfg.Start()
require.NoError(t, err) require.NoError(t, err)
...@@ -134,11 +130,9 @@ func TestLoadSequencerStateOnStarted_Started(t *testing.T) { ...@@ -134,11 +130,9 @@ func TestLoadSequencerStateOnStarted_Started(t *testing.T) {
cfg := DefaultSystemConfig(t) cfg := DefaultSystemConfig(t)
// We don't need a verifier - just the sequencer is enough // We don't need a verifier - just the sequencer is enough
delete(cfg.Nodes, "verifier") delete(cfg.Nodes, "verifier")
logger := testlog.Logger(t, log.LvlInfo)
seqCfg := cfg.Nodes["sequencer"] seqCfg := cfg.Nodes["sequencer"]
seqCfg.Driver.SequencerStopped = true seqCfg.Driver.SequencerStopped = true
seqCfg.ConfigPersistence = node.NewConfigPersistence(stateFile) seqCfg.ConfigPersistence = node.NewConfigPersistence(stateFile)
require.NoError(t, seqCfg.LoadPersisted(logger))
sys, err := cfg.Start() sys, err := cfg.Start()
require.NoError(t, err) require.NoError(t, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment