Commit df98e902 authored by Adrian Sutton's avatar Adrian Sutton Committed by GitHub

Use NewConfig to ensure defaults are set correctly. (#9714)

parent 4a3a18d9
...@@ -128,17 +128,10 @@ func Run(l1RpcUrl string, l1RpcKind string, l1BeaconUrl string, l2RpcUrl string, ...@@ -128,17 +128,10 @@ func Run(l1RpcUrl string, l1RpcKind string, l1BeaconUrl string, l2RpcUrl string,
if err != nil { if err != nil {
return fmt.Errorf("failed to load rollup config: %w", err) return fmt.Errorf("failed to load rollup config: %w", err)
} }
offlineCfg := config.Config{ offlineCfg := config.NewConfig(
Rollup: rollupCfg, rollupCfg, chainCfg, l1Head, l2Head, agreedOutput.OutputRoot, l2Claim, l2BlockNumber.Uint64())
DataDir: dataDir, offlineCfg.DataDir = dataDir
L2ChainConfig: chainCfg, onlineCfg := *offlineCfg
L2Head: l2Head,
L2OutputRoot: agreedOutput.OutputRoot,
L2Claim: l2Claim,
L2ClaimBlockNumber: l2BlockNumber.Uint64(),
L1Head: l1Head,
}
onlineCfg := offlineCfg
onlineCfg.L1URL = l1RpcUrl onlineCfg.L1URL = l1RpcUrl
onlineCfg.L1BeaconURL = l1BeaconUrl onlineCfg.L1BeaconURL = l1BeaconUrl
onlineCfg.L2URL = l2RpcUrl onlineCfg.L2URL = l2RpcUrl
...@@ -153,7 +146,7 @@ func Run(l1RpcUrl string, l1RpcKind string, l1BeaconUrl string, l2RpcUrl string, ...@@ -153,7 +146,7 @@ func Run(l1RpcUrl string, l1RpcKind string, l1BeaconUrl string, l2RpcUrl string,
} }
fmt.Println("Running in offline mode") fmt.Println("Running in offline mode")
err = host.Main(oplog.NewLogger(os.Stderr, logger), &offlineCfg) err = host.Main(oplog.NewLogger(os.Stderr, logger), offlineCfg)
if err != nil { if err != nil {
return fmt.Errorf("offline mode failed: %w", err) return fmt.Errorf("offline mode failed: %w", 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