fix tests collisions

Signed-off-by: Karim TAAM <[email protected]>
garyschulte · Aug 29, 2023 · d5959d8 · d5959d8
1 parent 9c6d247
commit d5959d8
Showing 1 changed file with 24 additions and 13 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java b/...ava/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java
@@ -299,6 +299,19 @@ public void commit() {
               final BonsaiAccount updatedAccount;
               final BonsaiValue<BonsaiAccount> updatedAccountValue =
                   accountsToUpdate.get(updatedAddress);
+
+              final Map<StorageSlotKey, BonsaiValue<UInt256>> pendingStorageUpdates =
+                  storageToUpdate.computeIfAbsent(
+                      updatedAddress,
+                      k ->
+                          new StorageConsumingMap<>(
+                              updatedAddress, new ConcurrentHashMap<>(), storagePreloader));
+
+              if (tracked.getStorageWasCleared()) {
+                storageToClear.add(updatedAddress);
+                pendingStorageUpdates.clear();
+              }
+
               if (tracked.getWrappedAccount() == null) {
                 updatedAccount = new BonsaiAccount(this, tracked);
                 tracked.setWrappedAccount(updatedAccount);
@@ -318,6 +331,17 @@ public void commit() {
                 }
                 if (tracked.getStorageWasCleared()) {
                   updatedAccount.clearStorage();
+                  wrappedWorldView()
+                      .getAllAccountStorage(updatedAddress, updatedAccount.getStorageRoot())
+                      .forEach(
+                          (keyHash, entryValue) -> {
+                            final StorageSlotKey storageSlotKey =
+                                new StorageSlotKey(Hash.wrap(keyHash), Optional.empty());
+                            final UInt256 value = UInt256.fromBytes(RLP.decodeOne(entryValue));
+                            pendingStorageUpdates.put(
+                                storageSlotKey, new BonsaiValue<>(value, null, true));
+                          });
+                  updatedAccount.setStorageRoot(Hash.EMPTY_TRIE_HASH);
                 }
                 tracked.getUpdatedStorage().forEach(updatedAccount::setStorageValue);
               }
@@ -346,19 +370,6 @@ public void commit() {
                 return;
               }
 
-              final StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>
-                  pendingStorageUpdates =
-                      storageToUpdate.computeIfAbsent(
-                          updatedAddress,
-                          __ ->
-                              new StorageConsumingMap<>(
-                                  updatedAddress, new ConcurrentHashMap<>(), storagePreloader));
-
-              if (tracked.getStorageWasCleared()) {
-                storageToClear.add(updatedAddress);
-                pendingStorageUpdates.clear();
-              }
-
               final TreeSet<Map.Entry<UInt256, UInt256>> entries =
                   new TreeSet<>(Map.Entry.comparingByKey());
               entries.addAll(updatedAccount.getUpdatedStorage().entrySet());