Skip to content

[Testing] Restore exact EVM updated-register count assertion #8629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janezpodhostnik wants to merge 1 commit into
base: janez/flaky-test-followup-spam-boundary
Choose a base branch
from
+26 −12
Open

[Testing] Restore exact EVM updated-register count assertion #8629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions fvm/evm/evm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package evm_test

import (
"bytes"
"crypto/sha256"
"encoding/binary"
"encoding/hex"
"fmt"
Expand Down Expand Up @@ -2943,12 +2944,9 @@ func TestCadenceOwnedAccountFunctionalities(t *testing.T) {
require.NoError(t, err)
require.NoError(t, output.Err)
assert.Len(t, output.Events, 3)
// This transaction must update state. The exact number of updated registers varies
// slightly between runs: the test environment uses a random block ID, which selects
// the UUID partition register (`uuid` vs `uuid_N`) and thereby also the atree slab
// layout. Hence, we only check that state was updated at all - in contrast to
// `dryCall` below, which must not update any registers.
assert.NotEmpty(t, state.UpdatedRegisterIDs())
// this transaction must update state - in contrast to the dry-run call below,
// which must not update any registers
assertUpdatedRegisterCount(t, ctx, state, 13)
assert.Equal(
t,
flow.EventType("A.f8d6e0586b0a20c7.EVM.TransactionExecuted"),
Expand Down Expand Up @@ -3096,12 +3094,9 @@ func TestCadenceOwnedAccountFunctionalities(t *testing.T) {
require.NoError(t, err)
require.NoError(t, output.Err)
assert.Len(t, output.Events, 3)
// This transaction must update state. The exact number of updated registers varies
// slightly between runs: the test environment uses a random block ID, which selects
// the UUID partition register (`uuid` vs `uuid_N`) and thereby also the atree slab
// layout. Hence, we only check that state was updated at all - in contrast to
// `dryCall` below, which must not update any registers.
assert.NotEmpty(t, state.UpdatedRegisterIDs())
// this transaction must update state - in contrast to the dry-run call below,
// which must not update any registers
assertUpdatedRegisterCount(t, ctx, state, 13)
assert.Equal(
t,
flow.EventType("A.f8d6e0586b0a20c7.EVM.TransactionExecuted"),
Expand Down Expand Up @@ -7189,6 +7184,25 @@ func getEVMAccountNonce(
return uint64(val)
}

// assertUpdatedRegisterCount asserts that the execution updated exactly the expected number of
// registers. `countNonZeroPartition` is the expected count for a block whose ID selects a
// non-zero UUID partition (see `environment.uuidPartition` with txnIndex 0, as used by these
// tests): such blocks use a fresh `uuid_N` register. A block selecting partition 0 (probability
// 1/256) reuses the legacy `uuid` register instead, updating one register fewer.
func assertUpdatedRegisterCount(
t *testing.T,
ctx fvm.Context,
state *snapshot.ExecutionSnapshot,
countNonZeroPartition int,
) {
expected := countNonZeroPartition
blockID := ctx.BlockHeader.ID()
if sha256.Sum256(blockID[:])[0] == 0 {
expected--
}
assert.Len(t, state.UpdatedRegisterIDs(), expected)
}

func RunWithNewEnvironment(
t *testing.T,
chain flow.Chain,
Expand Down
Loading