core, eth, trie, light: clean up trie interface #26388
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjl493456442
requested review from
zsfelfoldi,
karalabe and
holiman
as code owners
holiman
reviewed
Dec 28, 2022
|
Let's hold-on this PR for a while. I am not sure the change for |
rjl493456442
force-pushed
the
cleanup-trie-interface
branch
from
b5809b5
to
45743bc
Compare
holiman
approved these changes
Dec 29, 2022
eth/protocols/snap/handler.go
Outdated
| @@ -523,7 +523,7 @@ func ServiceGetTrieNodesQuery(chain *core.BlockChain, req *GetTrieNodesPacket, s | |||
| if snap == nil { | |||
| // We don't have the requested state snapshotted yet (or it is stale), | |||
| // but can look up the account via the trie instead. | |||
| account, err := accTrie.TryGetAccountWithPreHashedKey(pathset[0]) | |||
| account, err := accTrie.TryGetAccountWithHash(common.BytesToHash(pathset[0])) | |||
There was a problem hiding this comment.
Suggested change
| account, err := accTrie.TryGetAccountWithHash(common.BytesToHash(pathset[0])) | |
| account, err := accTrie.TryGetAccountByHash(common.BytesToHash(pathset[0])) |
?
eth/protocols/snap/handler.go
Outdated
| @@ -417,7 +417,7 @@ func ServiceGetStorageRangesQuery(chain *core.BlockChain, req *GetStorageRangesP | |||
| if err != nil { | |||
| return nil, nil | |||
| } | |||
| acc, err := accTrie.TryGetAccountWithPreHashedKey(account[:]) | |||
| acc, err := accTrie.TryGetAccountWithHash(account) | |||
There was a problem hiding this comment.
Suggested change
| acc, err := accTrie.TryGetAccountWithHash(account) | |
| acc, err := accTrie.TryGetAccountByHash(account) |
?
shekhirin
pushed a commit
to shekhirin/go-ethereum
that referenced
this pull request
Jun 6, 2023
* all: cleanup trie interface * eth, trie: address comments
2 tasks
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cleans up/improves some trie interfaces:
TryGetAccount,TryUpdateAccount,TryDeleteAccountacceptscommon.Addressas the parameters, which is more intuitive to callers