Revert "small improvement to remove ACCOUNT_HASH_BY_CODE_HASH if ther…

…e no references instead of storing empty list" This reverts commit 7661784.
hyperledger · Sep 20, 2023 · 1c948ff · 1c948ff
1 parent 7661784
commit 1c948ff
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/...in/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java b/...in/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java
@@ -384,14 +384,10 @@ public BonsaiUpdater removeCode(final Hash accountHash, final Hash codeHash) {
       final Set<Bytes32> updatedCodeAccounts = new HashSet<>(codeAccounts);
       updatedCodeAccounts.remove(accountHash);
 
-      if (!updatedCodeAccounts.isEmpty()) {
-        final Bytes encodedAddresses =
-            RLP.encode(o -> o.writeList(updatedCodeAccounts, (val, out) -> out.writeBytes(val)));
-        composedWorldStateTransaction.put(
-            ACCOUNT_HASH_BY_CODE_HASH, codeHash.toArray(), encodedAddresses.toArrayUnsafe());
-      } else {
-        composedWorldStateTransaction.remove(ACCOUNT_STORAGE_STORAGE, codeHash.toArrayUnsafe());
-      }
+      final Bytes encodedAddresses =
+          RLP.encode(o -> o.writeList(updatedCodeAccounts, (val, out) -> out.writeBytes(val)));
+      composedWorldStateTransaction.put(
+          ACCOUNT_HASH_BY_CODE_HASH, codeHash.toArray(), encodedAddresses.toArrayUnsafe());
 
       if (updatedCodeAccounts.isEmpty()) {
         composedWorldStateTransaction.remove(CODE_STORAGE_BY_HASH, codeHash.toArrayUnsafe());
@@ -412,7 +408,7 @@ public BonsaiUpdater putCode(final Hash accountHash, final Bytes32 codeHash, fin
       final Bytes encodedAddresses =
           RLP.encode(o -> o.writeList(updatedCodeAccounts, (val, out) -> out.writeBytes(val)));
       composedWorldStateTransaction.put(
-          ACCOUNT_HASH_BY_CODE_HASH, codeHash.toArrayUnsafe(), encodedAddresses.toArrayUnsafe());
+          ACCOUNT_HASH_BY_CODE_HASH, codeHash.toArray(), encodedAddresses.toArrayUnsafe());
 
       if (codeAccounts.isEmpty()) {
         composedWorldStateTransaction.put(