core/state: remove pointless wrapper functions (#30891)

This commit is contained in:
gitglorythegreat 2024-12-11 18:05:59 +08:00 committed by GitHub
parent 330190e476
commit c7e740f40c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 15 deletions

View File

@ -139,10 +139,7 @@ func (al *accessList) Equal(other *accessList) bool {
if !maps.Equal(al.addresses, other.addresses) {
return false
}
return slices.EqualFunc(al.slots, other.slots,
func(m map[common.Hash]struct{}, m2 map[common.Hash]struct{}) bool {
return maps.Equal(m, m2)
})
return slices.EqualFunc(al.slots, other.slots, maps.Equal)
}
// PrettyPrint prints the contents of the access list in a human-readable form

View File

@ -650,11 +650,7 @@ func (test *snapshotTest) checkEqual(state, checkstate *StateDB) error {
{
have := state.transientStorage
want := checkstate.transientStorage
eq := maps.EqualFunc(have, want,
func(a Storage, b Storage) bool {
return maps.Equal(a, b)
})
if !eq {
if !maps.EqualFunc(have, want, maps.Equal) {
return fmt.Errorf("transient storage differs ,have\n%v\nwant\n%v",
have.PrettyPrint(),
want.PrettyPrint())
@ -1034,12 +1030,8 @@ func testMissingTrieNodes(t *testing.T, scheme string) {
func TestStateDBAccessList(t *testing.T) {
// Some helpers
addr := func(a string) common.Address {
return common.HexToAddress(a)
}
slot := func(a string) common.Hash {
return common.HexToHash(a)
}
addr := common.HexToAddress
slot := common.HexToHash
db := NewDatabaseForTesting()
state, _ := New(types.EmptyRootHash, db)