Fix clashing import of AccountProof type. #1962
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
web3-developer
commented
Jan 10, 2024
| @@ -14,7 +14,7 @@ import | |||
| stew/results, | |||
| ./state_proof_types, | |||
| ../../../../stateless/[tree_from_witness, witness_types], | |||
| ../../../../nimbus/db/[core_db, state_db, state_db/base] | |||
| ../../../../nimbus/db/[core_db, state_db] | |||
There was a problem hiding this comment.
state_db/base contains another type named 'AccountProof' which is used in the Nimbus getProof RPC endpoint.
web3-developer
commented
Jan 10, 2024
| @@ -77,7 +77,7 @@ proc buildAccountsTableFromKeys( | |||
| for key in keys: | |||
| let account = db.getAccount(key.address) | |||
| let code = if key.codeLen > 0: | |||
| db.AccountStateDB.kvt().get(account.codeHash.data) | |||
| db.getTrie().parent().kvt().get(account.codeHash.data) | |||
There was a problem hiding this comment.
Now just using the types defined for the ReadOnlyStateDB type from the state_db import to avoid using AccountStateDB directly.
kdeme
approved these changes
Jan 10, 2024
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.
No description provided.