status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fluffy: Fix state validation issue causing portal hive test failure (#2732)

This commit is contained in:
bhartnett 2024-10-13 00:51:50 +08:00 committed by GitHub
parent 6e114dc950
commit 9db31ac17b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fluffy/docs/the_fluffy_book/docs/fluffy-with-portal-hive.md
View File

@ -1,4 +1,4 @@
# Fluffy with Portal-hive # Fluffy with Portal hive
Fluffy is one of the Portal clients that is being tested with [hive](https://github.com/ethereum/hive). Fluffy is one of the Portal clients that is being tested with [hive](https://github.com/ethereum/hive).
@ -39,7 +39,7 @@ create a local development docker image for Fluffy.
To do that follow next steps: To do that follow next steps:
1) Clone and build portal-hive, see above. 1) Clone and build hive, see above.
2) Build the local development Docker image using the following command: 2) Build the local development Docker image using the following command:
``` ```
@ -49,7 +49,7 @@ docker build --tag fluffy-dev --file ./fluffy/tools/docker/Dockerfile.portalhive
3) Modify the `FROM` tag in the portal-hive `Dockerfile` of fluffy at 3) Modify the `FROM` tag in the portal-hive `Dockerfile` of fluffy at
`portal-hive/clients/fluffy/Dockerfile` to use the image that was buid in step 2. `portal-hive/clients/fluffy/Dockerfile` to use the image that was buid in step 2.
4) Run the tests as [usually](fluffy-with-portal-hive.md/#run-the-hive-tests-locally). 4) Run the tests as [usual](fluffy-with-portal-hive.md/#run-the-hive-tests-locally).
!!! warning !!! warning
The `./vendors` dir is dockerignored and cached. If you have to make local The `./vendors` dir is dockerignored and cached. If you have to make local

6
fluffy/network/state/state_validation.nim
View File

@ -196,13 +196,13 @@ func validateRetrieval*(
raiseAssert("ContentKey contentType: unused") raiseAssert("ContentKey contentType: unused")
of accountTrieNode: of accountTrieNode:
let retrieval = ?AccountTrieNodeRetrieval.decode(contentBytes) let retrieval = ?AccountTrieNodeRetrieval.decode(contentBytes)
?validateRetrieval(key.accountTrieNodeKey, retrieval) validateRetrieval(key.accountTrieNodeKey, retrieval)
of contractTrieNode: of contractTrieNode:
let retrieval = ?ContractTrieNodeRetrieval.decode(contentBytes) let retrieval = ?ContractTrieNodeRetrieval.decode(contentBytes)
?validateRetrieval(key.contractTrieNodeKey, retrieval) validateRetrieval(key.contractTrieNodeKey, retrieval)
of contractCode: of contractCode:
let retrieval = ?ContractCodeRetrieval.decode(contentBytes) let retrieval = ?ContractCodeRetrieval.decode(contentBytes)
?validateRetrieval(key.contractCodeKey, retrieval) validateRetrieval(key.contractCodeKey, retrieval)
func validateOfferGetValue*( func validateOfferGetValue*(
trustedStateRoot: Opt[Hash32], key: ContentKey, contentBytes: seq[byte] trustedStateRoot: Opt[Hash32], key: ContentKey, contentBytes: seq[byte]