Commit 01454bf6 authored by Mark Tyneway's avatar Mark Tyneway

op-chain-ops: fix merge conflict issue

Update to op-geth version changes the function signature,
this commit fixes it so that the correct function signature
is used.
parent e9045720
...@@ -68,7 +68,7 @@ func TestPreCheckWithdrawals_InvalidSlotInStorage(t *testing.T) { ...@@ -68,7 +68,7 @@ func TestPreCheckWithdrawals_InvalidSlotInStorage(t *testing.T) {
root, err := stateDB.Commit(false) root, err := stateDB.Commit(false)
require.NoError(t, err) require.NoError(t, err)
err = stateDB.Database().TrieDB().Commit(root, true, nil) err = stateDB.Database().TrieDB().Commit(root, true)
require.NoError(t, err) require.NoError(t, err)
_, err = PreCheckWithdrawals(stateDB, nil) _, err = PreCheckWithdrawals(stateDB, nil)
...@@ -127,7 +127,7 @@ func runPrecheck(t *testing.T, dbWds []*LegacyWithdrawal, witnessWds []*LegacyWi ...@@ -127,7 +127,7 @@ func runPrecheck(t *testing.T, dbWds []*LegacyWithdrawal, witnessWds []*LegacyWi
root, err := stateDB.Commit(false) root, err := stateDB.Commit(false)
require.NoError(t, err) require.NoError(t, err)
err = stateDB.Database().TrieDB().Commit(root, true, nil) err = stateDB.Database().TrieDB().Commit(root, true)
require.NoError(t, err) require.NoError(t, err)
return PreCheckWithdrawals(stateDB, witnessWds) 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