Skip to content

unit tests for merging same account accesses #6965

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

Merged
BeniaminDrasovean merged 2 commits into from
Apr 29, 2025
Merged

unit tests for merging same account accesses #6965

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89db070
added unit tests
danielradu10 Apr 28, 2025
2452545
fixes after reviews
danielradu10 Apr 29, 2025
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
327 changes: 327 additions & 0 deletions state/stateAccesses/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,333 @@ func TestStateAccessesCollector_GetCollectedAccesses(t *testing.T) {
},
})
})

t.Run("not merging for different accounts", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite())
assert.Equal(t, 0, len(c.stateAccesses))

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal1"),
})

c.AddStateAccess(&data.StateAccess{
Type: data.Read,
Index: 0,
TxHash: []byte("hash"),
MainTrieKey: []byte("account2"),
MainTrieVal: []byte("mainTrieVal2"),
})

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["hash"].StateAccess, 2)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"hash": {
StateAccess: []*data.StateAccess{
{MainTrieKey: []byte("account1"), Type: data.Write, TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal1")},
{MainTrieKey: []byte("account2"), Type: data.Read, TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal2")},
},
},
})
})

t.Run("not merging for different action types", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite())
assert.Equal(t, 0, len(c.stateAccesses))

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal1"),
})

c.AddStateAccess(&data.StateAccess{
Type: data.Read,
Index: 0,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal2"),
})

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["hash"].StateAccess, 2)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"hash": {
StateAccess: []*data.StateAccess{
{MainTrieKey: []byte("account1"), Type: data.Write, TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal1")},
{MainTrieKey: []byte("account1"), Type: data.Read, TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal2")},
},
},
})
})

t.Run("merging for same action types, last mainTrieVal should remain", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite())
assert.Equal(t, 0, len(c.stateAccesses))

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal1"),
})

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
Index: 0,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal2"),
})

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["hash"].StateAccess, 1)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"hash": {
StateAccess: []*data.StateAccess{
{
MainTrieKey: []byte("account1"), Type: data.Write,
TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal2"),
DataTrieChanges: make([]*data.DataTrieChange, 0),
},
},
},
})
})

t.Run("merging nil account changes should return one account change", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite(), WithAccountChanges())
assert.Equal(t, 0, len(c.stateAccesses))

defaultAccChanges := &data.AccountChanges{
Nonce: false,
Balance: false,
CodeHash: false,
RootHash: false,
DeveloperReward: false,
OwnerAddress: false,
UserName: false,
CodeMetadata: false,
}

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal1"),
AccountChanges: defaultAccChanges,
})

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
Index: 0,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal2"),
AccountChanges: nil,
})

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["hash"].StateAccess, 1)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"hash": {
StateAccess: []*data.StateAccess{
{
MainTrieKey: []byte("account1"), Type: data.Write,
TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal2"),
DataTrieChanges: make([]*data.DataTrieChange, 0),
AccountChanges: defaultAccChanges,
},
},
},
})
})

t.Run("merging not nil account changes should work", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite(), WithAccountChanges())
assert.Equal(t, 0, len(c.stateAccesses))

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal1"),
AccountChanges: &data.AccountChanges{
Nonce: false,
Balance: true,
CodeHash: false,
RootHash: true,
DeveloperReward: false,
OwnerAddress: true,
UserName: false,
CodeMetadata: true,
},
})

c.AddStateAccess(&data.StateAccess{
Type: data.Write,
Index: 0,
TxHash: []byte("hash"),
MainTrieKey: []byte("account1"),
MainTrieVal: []byte("mainTrieVal2"),
AccountChanges: &data.AccountChanges{
Nonce: true,
Balance: false,
CodeHash: true,
RootHash: false,
DeveloperReward: true,
OwnerAddress: false,
UserName: true,
CodeMetadata: false,
},
})

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["hash"].StateAccess, 1)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"hash": {
StateAccess: []*data.StateAccess{
{
MainTrieKey: []byte("account1"), Type: data.Write,
TxHash: []byte("hash"), MainTrieVal: []byte("mainTrieVal2"),
DataTrieChanges: make([]*data.DataTrieChange, 0),
AccountChanges: &data.AccountChanges{
Nonce: true,
Balance: true,
CodeHash: true,
RootHash: true,
DeveloperReward: true,
OwnerAddress: true,
UserName: true,
CodeMetadata: true,
},
},
},
},
})
})

t.Run("merge should work", func(t *testing.T) {
t.Parallel()

c, _ := NewCollector(disabled.NewDisabledStateAccessesStorer(), WithCollectRead(), WithCollectWrite(), WithAccountChanges())
assert.Equal(t, 0, len(c.stateAccesses))

defaultAccChanges := &data.AccountChanges{
Nonce: false,
Balance: false,
CodeHash: false,
RootHash: false,
DeveloperReward: false,
OwnerAddress: false,
UserName: false,
CodeMetadata: false,
}

modifiedAccChanges := &data.AccountChanges{
Nonce: false,
Balance: true,
CodeHash: false,
RootHash: true,
DeveloperReward: false,
OwnerAddress: true,
UserName: false,
CodeMetadata: true,
}

operations := []uint32{
data.NotSet,
data.GetCode,
data.SaveAccount,
data.GetAccount,
data.WriteCode,
data.RemoveDataTrie,
data.GetDataTrieValue,
}

var accChanges *data.AccountChanges
numStateChanges := 20
for i := 0; i < numStateChanges; i++ {
if i%2 == 0 {
c.AddStateAccess(&data.StateAccess{
MainTrieKey: []byte("key"),
Type: data.Write,
// distribute evenly based on parity of the index
TxHash: []byte("txHash"),
AccountChanges: defaultAccChanges,
MainTrieVal: []byte(fmt.Sprintf("mainTrieVal%d", i)),
Operation: operations[i%len(operations)],
})
} else {
if i == 19 {
accChanges = modifiedAccChanges
} else {
accChanges = defaultAccChanges
}
c.AddStateAccess(&data.StateAccess{
MainTrieKey: []byte("key"),
Type: data.Read,
// distribute evenly based on parity of the index
TxHash: []byte("txHash"),
AccountChanges: accChanges,
MainTrieVal: []byte(fmt.Sprintf("mainTrieVal%d", i)),
})
}
}

stateChangesForTx := c.GetCollectedAccesses()

require.Len(t, stateChangesForTx, 1)
require.Len(t, stateChangesForTx["txHash"].StateAccess, 2)

require.Equal(t, stateChangesForTx, map[string]*data.StateAccesses{
"txHash": {
StateAccess: []*data.StateAccess{
{
MainTrieKey: []byte("key"), Type: data.Write, TxHash: []byte("txHash"),
DataTrieChanges: make([]*data.DataTrieChange, 0),
AccountChanges: defaultAccChanges,
MainTrieVal: []byte(fmt.Sprintf("mainTrieVal%d", 18)),
Operation: 63,
},
{
MainTrieKey: []byte("key"), Type: data.Read, TxHash: []byte("txHash"),
DataTrieChanges: make([]*data.DataTrieChange, 0),
AccountChanges: modifiedAccChanges,
MainTrieVal: []byte(fmt.Sprintf("mainTrieVal%d", 19)),
},
},
},
})
})
}

func TestCollector_GetAccountChanges(t *testing.T) {
Expand Down