Commit 9cdd3673 authored by Tei Im's avatar Tei Im Committed by GitHub

Add missing checks in cannon fuzz_evm_test (#9597)

Fix preimageWrite count calculation
parent 651898c5
...@@ -322,6 +322,7 @@ func FuzzStateHintRead(f *testing.F) { ...@@ -322,6 +322,7 @@ func FuzzStateHintRead(f *testing.F) {
require.Equal(t, preStateRoot, state.Memory.MerkleRoot()) require.Equal(t, preStateRoot, state.Memory.MerkleRoot())
require.Equal(t, uint64(1), state.Step) require.Equal(t, uint64(1), state.Step)
require.Equal(t, preStatePreimageKey, state.PreimageKey) require.Equal(t, preStatePreimageKey, state.PreimageKey)
require.Equal(t, expectedRegisters, state.Registers)
evm := NewMIPSEVM(contracts, addrs) evm := NewMIPSEVM(contracts, addrs)
evmPost := evm.Step(t, stepWitness) evmPost := evm.Step(t, stepWitness)
...@@ -439,6 +440,7 @@ func FuzzStateHintWrite(f *testing.F) { ...@@ -439,6 +440,7 @@ func FuzzStateHintWrite(f *testing.F) {
require.Equal(t, preStateRoot, state.Memory.MerkleRoot()) require.Equal(t, preStateRoot, state.Memory.MerkleRoot())
require.Equal(t, uint64(1), state.Step) require.Equal(t, uint64(1), state.Step)
require.Equal(t, preStatePreimageKey, state.PreimageKey) require.Equal(t, preStatePreimageKey, state.PreimageKey)
require.Equal(t, expectedRegisters, state.Registers)
evm := NewMIPSEVM(contracts, addrs) evm := NewMIPSEVM(contracts, addrs)
evmPost := evm.Step(t, stepWitness) evmPost := evm.Step(t, stepWitness)
...@@ -471,9 +473,9 @@ func FuzzStatePreimageWrite(f *testing.F) { ...@@ -471,9 +473,9 @@ func FuzzStatePreimageWrite(f *testing.F) {
expectedRegisters := state.Registers expectedRegisters := state.Registers
sz := 4 - (addr & 0x3) sz := 4 - (addr & 0x3)
if sz < count { if sz < count {
sz = count count = sz
} }
expectedRegisters[2] = sz expectedRegisters[2] = count
oracle := staticOracle(t, preimageData) oracle := staticOracle(t, preimageData)
goState := NewInstrumentedState(state, oracle, os.Stdout, os.Stderr) goState := NewInstrumentedState(state, oracle, os.Stdout, os.Stderr)
...@@ -491,6 +493,7 @@ func FuzzStatePreimageWrite(f *testing.F) { ...@@ -491,6 +493,7 @@ func FuzzStatePreimageWrite(f *testing.F) {
require.Equal(t, preStateRoot, state.Memory.MerkleRoot()) require.Equal(t, preStateRoot, state.Memory.MerkleRoot())
require.Equal(t, uint64(1), state.Step) require.Equal(t, uint64(1), state.Step)
require.Equal(t, uint32(0), state.PreimageOffset) require.Equal(t, uint32(0), state.PreimageOffset)
require.Equal(t, expectedRegisters, state.Registers)
evm := NewMIPSEVM(contracts, addrs) evm := NewMIPSEVM(contracts, addrs)
evmPost := evm.Step(t, stepWitness) evmPost := evm.Step(t, stepWitness)
......
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