forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-17 18:30:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core/state: simplify meter code #24304 (#1208)

Browse source
This commit is contained in:
Daniel Liu 2025-07-11 10:15:16 +08:00 committed by GitHub
parent 906f07736e
commit 495a8b919a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/state/state_object.go
View file

@ -201,9 +201,10 @@ func (s *stateObject) GetCommittedState(db Database, key common.Hash) common.Has
return value return value
} }
// Track the amount of time wasted on reading the storage trie // Track the amount of time wasted on reading the storage trie
defer func(start time.Time) { s.db.StorageReads += time.Since(start) }(time.Now()) start := time.Now()
// Otherwise load the value from the database // Otherwise load the value from the database
enc, err := s.getTrie(db).TryGet(key[:]) enc, err := s.getTrie(db).TryGet(key.Bytes())
s.db.StorageReads += time.Since(start)
if err != nil { if err != nil {
s.setError(err) s.setError(err)
return common.Hash{} return common.Hash{}

10
core/state/statedb.go
View file

@ -526,10 +526,14 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject {
return obj return obj
} }
// Track the amount of time wasted on loading the object from the database // Track the amount of time wasted on loading the object from the database
defer func(start time.Time) { s.AccountReads += time.Since(start) }(time.Now()) start := time.Now()
// Load the object from the database // Load the object from the database
enc, err := s.trie.TryGet(addr[:]) enc, err := s.trie.TryGet(addr.Bytes())
s.AccountReads += time.Since(start)
if err != nil {
s.setError(fmt.Errorf("getDeleteStateObject (%x) error: %v", addr.Bytes(), err))
return nil
}
if len(enc) == 0 { if len(enc) == 0 {
s.setError(err) s.setError(err)
return nil return nil