pass limit into streamFlatAccounts, make ref test preimageproxy synch…

…ronized to avoid concurrency issues Signed-off-by: garyschulte <garyschulte@gmail.com>
hyperledger · Aug 29, 2023 · f41cb02 · f41cb02
1 parent d5959d8
commit f41cb02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.../core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiPreImageProxy.java b/.../core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiPreImageProxy.java
@@ -69,7 +69,7 @@ class BonsaiReferenceTestPreImageProxy extends NoOpPreImageProxy {
     BiMap<Hash, Bytes> preImageCache = HashBiMap.create();
 
     @Override
-    public Hash hashAndSavePreImage(final Bytes value) {
+    public synchronized Hash hashAndSavePreImage(final Bytes value) {
       return preImageCache.inverse().computeIfAbsent(value, Hash::hash);
     }
 

diff --git a/...in/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java b/...in/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java
@@ -295,7 +295,7 @@ public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
 
   public Stream<WorldState.StreamableAccount> streamAccounts(
       final BonsaiWorldView context, final Bytes32 startKeyHash, final int limit) {
-    return streamFlatAccounts(startKeyHash, BYTES32_MAX_VALUE, Long.MAX_VALUE)
+    return streamFlatAccounts(startKeyHash, BYTES32_MAX_VALUE, limit)
         .entrySet()
         // map back to addresses using preImage provider:
         .stream()

diff --git a/...src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java b/...src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java
@@ -15,10 +15,10 @@
  */
 package org.hyperledger.besu.ethereum.bonsai.storage.flat;
 
-import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE;
-import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.ACCOUNT_STORAGE_STORAGE;
-import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.CODE_STORAGE;
-
+import kotlin.Pair;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.StorageSlotKey;
 import org.hyperledger.besu.ethereum.trie.NodeLoader;
@@ -34,10 +34,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import kotlin.Pair;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.rlp.RLP;
+import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE;
+import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.ACCOUNT_STORAGE_STORAGE;
+import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.CODE_STORAGE;
 
 /**
  * This class represents a FlatDbReaderStrategy, which is responsible for reading data from flat