Skip to content

N
nebula
Commit ab603c69 authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub
Browse files
Options

Merge pull request #4939 from ethereum-optimism/fix/merge-op-geth-conflict 

op-chain-ops: fix merge conflict issue
parents e9045720 01454bf6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
op-chain-ops/crossdomain/precheck_test.go
View file @ ab603c69
......@@ -68,7 +68,7 @@ func TestPreCheckWithdrawals_InvalidSlotInStorage(t *testing.T) {
root, err := stateDB.Commit(false)
require.NoError(t, err)
err = stateDB.Database().TrieDB().Commit(root, true, nil)
err = stateDB.Database().TrieDB().Commit(root, true)
require.NoError(t, err)
_, err = PreCheckWithdrawals(stateDB, nil)
......@@ -127,7 +127,7 @@ func runPrecheck(t *testing.T, dbWds []*LegacyWithdrawal, witnessWds []*LegacyWi
root, err := stateDB.Commit(false)
require.NoError(t, err)
err = stateDB.Database().TrieDB().Commit(root, true, nil)
err = stateDB.Database().TrieDB().Commit(root, true)
require.NoError(t, err)
return PreCheckWithdrawals(stateDB, witnessWds)
......
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