-
Notifications
You must be signed in to change notification settings - Fork 861
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix snapsync issue with forest (#5776)
Fixing an issue during snapsync with forest related to the heal step Signed-off-by: Karim TAAM <[email protected]>
- Loading branch information
Showing
7 changed files
with
153 additions
and
23 deletions.
There are no files selected for viewing
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
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
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
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
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
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
113 changes: 113 additions & 0 deletions
113
...edger/besu/ethereum/eth/sync/snapsync/request/heal/StorageTrieNodeHealingRequestTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Copyright Hyperledger Besu Contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
| package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal; | ||
|
|
||
| import org.hyperledger.besu.datatypes.Address; | ||
| import org.hyperledger.besu.datatypes.Hash; | ||
| import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage; | ||
| import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider; | ||
| import org.hyperledger.besu.ethereum.core.TrieGenerator; | ||
| import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState; | ||
| import org.hyperledger.besu.ethereum.rlp.RLP; | ||
| import org.hyperledger.besu.ethereum.storage.StorageProvider; | ||
| import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage; | ||
| import org.hyperledger.besu.ethereum.trie.MerkleTrie; | ||
| import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat; | ||
| import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue; | ||
| import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage; | ||
| import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; | ||
| import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; | ||
|
|
||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes; | ||
| import org.assertj.core.api.Assertions; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.api.extension.ExtensionContext; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.ArgumentsProvider; | ||
| import org.junit.jupiter.params.provider.ArgumentsSource; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| class StorageTrieNodeHealingRequestTest { | ||
|
|
||
| @Mock private SnapWorldDownloadState downloadState; | ||
| final List<Address> accounts = | ||
| List.of( | ||
| Address.fromHexString("0xdeadbeef"), | ||
| Address.fromHexString("0xdeadbeee"), | ||
| Address.fromHexString("0xdeadbeea"), | ||
| Address.fromHexString("0xdeadbeeb")); | ||
|
|
||
| private WorldStateStorage worldStateStorage; | ||
|
|
||
| private Hash account0Hash; | ||
| private Hash account0StorageRoot; | ||
|
|
||
| static class StorageFormatArguments implements ArgumentsProvider { | ||
| @Override | ||
| public Stream<? extends Arguments> provideArguments(final ExtensionContext context) { | ||
| return Stream.of( | ||
| Arguments.of(DataStorageFormat.BONSAI), Arguments.of(DataStorageFormat.FOREST)); | ||
| } | ||
| } | ||
|
|
||
| public void setup(final DataStorageFormat storageFormat) { | ||
| if (storageFormat.equals(DataStorageFormat.FOREST)) { | ||
| worldStateStorage = new WorldStateKeyValueStorage(new InMemoryKeyValueStorage()); | ||
| } else { | ||
| final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider(); | ||
| worldStateStorage = | ||
| new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()); | ||
| } | ||
| final MerkleTrie<Bytes, Bytes> trie = | ||
| TrieGenerator.generateTrie( | ||
| worldStateStorage, | ||
| accounts.stream().map(Address::addressHash).collect(Collectors.toList())); | ||
| account0Hash = accounts.get(0).addressHash(); | ||
| account0StorageRoot = | ||
| trie.get(account0Hash) | ||
| .map(RLP::input) | ||
| .map(StateTrieAccountValue::readFrom) | ||
| .map(StateTrieAccountValue::getStorageRoot) | ||
| .orElseThrow(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ArgumentsSource(StorageFormatArguments.class) | ||
| void shouldDetectExistingData(final DataStorageFormat storageFormat) { | ||
| setup(storageFormat); | ||
| final StorageTrieNodeHealingRequest request = | ||
| new StorageTrieNodeHealingRequest( | ||
| account0StorageRoot, account0Hash, Hash.EMPTY, Bytes.EMPTY); | ||
|
|
||
| Assertions.assertThat(request.getExistingData(downloadState, worldStateStorage)).isPresent(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @ArgumentsSource(StorageFormatArguments.class) | ||
| void shouldDetectMissingData(final DataStorageFormat storageFormat) { | ||
| setup(storageFormat); | ||
| final StorageTrieNodeHealingRequest request = | ||
| new StorageTrieNodeHealingRequest(Hash.EMPTY, account0Hash, Hash.EMPTY, Bytes.EMPTY); | ||
|
|
||
| Assertions.assertThat(request.getExistingData(downloadState, worldStateStorage)).isEmpty(); | ||
| } | ||
| } |