forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update reader.go

Browse source
This commit is contained in:
oooLowNeoNooo 2025-10-01 18:45:27 +02:00 committed by GitHub
parent 201742c4b9
commit 0f5727d636
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
triedb/pathdb/reader.go
View file

@ -66,7 +66,7 @@ type reader struct {
func (r *reader) Node(owner common.Hash, path []byte, hash common.Hash) ([]byte, error) { func (r *reader) Node(owner common.Hash, path []byte, hash common.Hash) ([]byte, error) {
blob, got, loc, err := r.layer.node(owner, path, 0) blob, got, loc, err := r.layer.node(owner, path, 0)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to retrieve node for owner %x, path %x: %w", owner, path, err)
} }
// Error out if the local one is inconsistent with the target. // Error out if the local one is inconsistent with the target.
if !r.noHashCheck && got != hash { if !r.noHashCheck && got != hash {
@ -102,7 +102,7 @@ func (r *reader) Node(owner common.Hash, path []byte, hash common.Hash) ([]byte,
func (r *reader) AccountRLP(hash common.Hash) ([]byte, error) { func (r *reader) AccountRLP(hash common.Hash) ([]byte, error) {
l, err := r.db.tree.lookupAccount(hash, r.state) l, err := r.db.tree.lookupAccount(hash, r.state)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to lookup account %x: %w", hash, err)
} }
// If the located layer is stale, fall back to the slow path to retrieve // If the located layer is stale, fall back to the slow path to retrieve
// the account data. This is an edge case where the located layer is the // the account data. This is an edge case where the located layer is the
@ -129,7 +129,7 @@ func (r *reader) AccountRLP(hash common.Hash) ([]byte, error) {
func (r *reader) Account(hash common.Hash) (*types.SlimAccount, error) { func (r *reader) Account(hash common.Hash) (*types.SlimAccount, error) {
blob, err := r.AccountRLP(hash) blob, err := r.AccountRLP(hash)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to retrieve account RLP for %x: %w", hash, err)
} }
if len(blob) == 0 { if len(blob) == 0 {
return nil, nil return nil, nil
@ -151,7 +151,7 @@ func (r *reader) Account(hash common.Hash) (*types.SlimAccount, error) {
func (r *reader) Storage(accountHash, storageHash common.Hash) ([]byte, error) { func (r *reader) Storage(accountHash, storageHash common.Hash) ([]byte, error) {
l, err := r.db.tree.lookupStorage(accountHash, storageHash, r.state) l, err := r.db.tree.lookupStorage(accountHash, storageHash, r.state)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to lookup storage for account %x, storage %x: %w", accountHash, storageHash, err)
} }
// If the located layer is stale, fall back to the slow path to retrieve // If the located layer is stale, fall back to the slow path to retrieve
// the storage data. This is an edge case where the located layer is the // the storage data. This is an edge case where the located layer is the
@ -263,7 +263,7 @@ func (r *HistoricalStateReader) AccountRLP(address common.Address) ([]byte, erro
hash := crypto.Keccak256Hash(address.Bytes()) hash := crypto.Keccak256Hash(address.Bytes())
latest, err := dl.account(hash, 0) latest, err := dl.account(hash, 0)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to retrieve latest account for address %x: %w", address, err)
} }
return r.reader.read(newAccountIdentQuery(address, hash), r.id, dl.stateID(), latest) return r.reader.read(newAccountIdentQuery(address, hash), r.id, dl.stateID(), latest)
} }
@ -276,7 +276,7 @@ func (r *HistoricalStateReader) AccountRLP(address common.Address) ([]byte, erro
func (r *HistoricalStateReader) Account(address common.Address) (*types.SlimAccount, error) { func (r *HistoricalStateReader) Account(address common.Address) (*types.SlimAccount, error) {
blob, err := r.AccountRLP(address) blob, err := r.AccountRLP(address)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to retrieve account RLP for address %x: %w", address, err)
} }
if len(blob) == 0 { if len(blob) == 0 {
return nil, nil return nil, nil
@ -314,7 +314,7 @@ func (r *HistoricalStateReader) Storage(address common.Address, key common.Hash)
keyHash := crypto.Keccak256Hash(key.Bytes()) keyHash := crypto.Keccak256Hash(key.Bytes())
latest, err := dl.storage(addrHash, keyHash, 0) latest, err := dl.storage(addrHash, keyHash, 0)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to retrieve latest storage for address %x, key %x: %w", address, key, err)
} }
return r.reader.read(newStorageIdentQuery(address, addrHash, key, keyHash), r.id, dl.stateID(), latest) return r.reader.read(newStorageIdentQuery(address, addrHash, key, keyHash), r.id, dl.stateID(), latest)
} }