From d294dd04d53b7a29c604492807a40f47288fe6d4 Mon Sep 17 00:00:00 2001 From: maskpp Date: Thu, 13 Jun 2024 01:31:25 +0800 Subject: [PATCH] get keys by maps.Keys --- triedb/pathdb/history.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/triedb/pathdb/history.go b/triedb/pathdb/history.go index 3663cbbdb9..34311e559f 100644 --- a/triedb/pathdb/history.go +++ b/triedb/pathdb/history.go @@ -29,6 +29,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/trie/triestate" + "golang.org/x/exp/maps" ) // State history records the state changes involved in executing a block. The @@ -244,19 +245,13 @@ type history struct { // newHistory constructs the state history object with provided state change set. func newHistory(root common.Hash, parent common.Hash, block uint64, states *triestate.Set) *history { var ( - accountList []common.Address + accountList = maps.Keys(states.Accounts) storageList = make(map[common.Address][]common.Hash) ) - for addr := range states.Accounts { - accountList = append(accountList, addr) - } slices.SortFunc(accountList, common.Address.Cmp) for addr, slots := range states.Storages { - slist := make([]common.Hash, 0, len(slots)) - for slotHash := range slots { - slist = append(slist, slotHash) - } + slist := maps.Keys(slots) slices.SortFunc(slist, common.Hash.Cmp) storageList[addr] = slist }