equivalent signal for state removal checks in MarkSweepPrunerTest

Signed-off-by: garyschulte <garyschulte@gmail.com>
garyschulte · Jul 25, 2023 · 109b0a3 · 109b0a3
1 parent b8a572f
commit 109b0a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...reum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java b/...reum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java
@@ -146,9 +146,10 @@ public void sweepBefore_shouldSweepStateRootFirst() {
     // the full prune but without enforcing an ordering between the state root removals
     stateRoots.forEach(
         stateRoot -> {
-          final InOrder thisRootsOrdering = inOrder(hashValueStore, worldStateStorage);
-          // disable this validation since the underlying storage no longer directly uses .remove()
-          // thisRootsOrdering.verify(hashValueStore).remove(stateRoot);
+          final InOrder thisRootsOrdering =
+              inOrder(worldStateStorage, hashValueStore, worldStateStorage);
+          thisRootsOrdering.verify(worldStateStorage).isWorldStateAvailable(stateRoot, null);
+          thisRootsOrdering.verify(hashValueStore).keySet();
           thisRootsOrdering.verify(worldStateStorage).prune(any());
         });
   }
@@ -184,9 +185,10 @@ public void sweepBefore_shouldNotRemoveMarkedStateRoots() {
     // the full prune but without enforcing an ordering between the state root removals
     stateRoots.forEach(
         stateRoot -> {
-          final InOrder thisRootsOrdering = inOrder(hashValueStore, worldStateStorage);
-          // disable this validation since the underlying storage no longer directly uses .remove()
-          // thisRootsOrdering.verify(hashValueStore).remove(stateRoot);
+          final InOrder thisRootsOrdering =
+              inOrder(worldStateStorage, hashValueStore, worldStateStorage);
+          thisRootsOrdering.verify(worldStateStorage).isWorldStateAvailable(stateRoot, null);
+          thisRootsOrdering.verify(hashValueStore).keySet();
           thisRootsOrdering.verify(worldStateStorage).prune(any());
         });
 

diff --git a/ethereum/evmtool/txs.rlp b/ethereum/evmtool/txs.rlp
@@ -0,0 +1 @@
+0xf90620f860800a8307a12094000000000000000000000000000000000000010080801ca0f73b923883495dc2174285c8fa4176de3d45accfb11cc8034ea1dd09831a4ddfa01c6bccbcd655b4022bcc27de4b9d5cee9ce999cdb8459b0afec4f5054ea02243f860010a8307a12094000000000000000000000000000000000000010180801ba0bffca3f433f61c957d822af37f2b49c57700ff338588d51ea82dc9f720c91d9da0168bb65cc72d586384383f8ceef3a6a60e54b7f4aaa978a6dad271ced54b2ebff860020a8307a12094000000000000000000000000000000000000010280801ba03d9f110bcf0c44be552d4d0ec8387b705604f7d3bb3794dcef4004c38963103ea013bda734f3b5987b8c855f6aab046754506266ff32352ba0898c4eba4acaec8bf860030a8307a12094000000000000000000000000000000000000010380801ba0ecb276d2486664ea779813e599b6f07b7b0df746626d7fdddf60ea425efcb324a0739841682e79a8302dc2e146dfd1eecbdc611d386d42287bcdd94a39bf536020f860040a8307a12094000000000000000000000000000000000000010480801ba002866b5c5fa5dbfa3d88b71a49b82a779c2d508cda631893176782dbcd7435aaa003c380a9af9bfdb3503abcfd5037d3c66f39bb7a19011a3291712d22292c5236f860050a8307a12094000000000000000000000000000000000000010580801ca0c70d2e000e503933d0f1a9a923dc647924811a912adf77692ff7d8f6808d5617a04ad82c92b980580a4a67e4c405e83d560a14201c3fd4b3a42d34dcc19336479af860060a8307a12094000000000000000000000000000000000000010680801ca07f2527f8cbe14e021d270dd214a1820355c7af128001889f57b7f9bba46a6c5da03033308de0d39b9d1b47d28f81df39ceaff330349298c65deb836efe8bce273ff860070a8307a12094000000000000000000000000000000000000010780801ba0ecb720a8764f8967b95dc66e961c6261fceb392c0e90461d7d66113d3c8bbd12a02655e28b751cc2e03a835aa817d884b540765dba12968bc53f53737b4234ee21f860080a8307a12094000000000000000000000000000000000000010880801ba095a2e27c0b296679141c0ad61be112f689b134c04d1773814ddae67fefb2dfbda02955f126d57d8b9777f47c520ffe4285890ca2dd1189e67b3407d6369997e7ecf860090a8307a12094000000000000000000000000000000000000010980801ca02468a120d0ee8c57caac354f56842a1db10813169a328f9f852279668b573907a03971f4c2e6bc0aa666812712719199df6fe37c0e1e122131cdb47d6c0c77b371f8600a0a8307a12094000000000000000000000000000000000000010a80801ba0a3a2018ab0bc2695b94bb85d710f4d07132a94f8c3e0f385824da5fee11899a5a00d2dfe430ea5aaff3de8bbb9339e7485474c8e4e34636f787124a7a91e4d6d6af8600b0a8307a12094000000000000000000000000000000000000010b80801ba0b91968fdb3aecea26094ec30649daa4de81a875bcb1a123e732b8f3f112ce232a02ef8cd85969d8bcef5f4ee1f5d20783b8d9b7466726c15ebf911565825187665f8600c0a8307a12094000000000000000000000000000000000000010c80801ca0dd27e75aa990793205805c22265b04be8299b208fad4f37a7f652ecf32b67390a05aa8cda18521548ff8f95e88f49f309d05cab32de28a0942b8a7a824c50df459f8600d0a8307a12094000000000000000000000000000000000000010d80801ba0fad07ce7139dd4e00266194e6a51c048f74eaba3c0a1b03ece378a810abfaa63a04fec880dafaa5382797b4f88b16138b1f0c4e084817072c77ff9bf17ddd4ac26f8600e0a8307a12094000000000000000000000000000000000000010e80801ca0208b22ab245221bdc5cae6586d2ef019a2c37be41166e04b8abe354c41a8f5b6a032d5d6ef07731cd1684531c775c1727ef6ba75de18cda96d998aaa0c1db0bd68f8600f0a8307a12094000000000000000000000000000000000000010f80801ba0055225ffd3d8b2d19c32aa68cb46e7b52c1d99844fb8b7a53b922ea1649e9c5ba06ae2a1e3b9712354b706d0f4da6ea76ed2f8f75277a51a14a3e0ccf25b85c626