fix unit tests

Signed-off-by: Karim Taam <[email protected]>
hyperledger · Jun 12, 2024 · e2f541a · e2f541a
1 parent a4aff35
commit e2f541a
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 21 deletions.
diff --git a/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/...integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
@@ -131,6 +131,7 @@ public JsonRpcResponse response(
             null, // ToDo 4844: set with the value of excess_blob_gas field
             null, // TODO 4788: set with the value of the parent beacon block root field
             requestsRoot,
+            null,
             blockHeaderFunctions);
 
     return new JsonRpcSuccessResponse(

diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -67,7 +67,7 @@
 import org.hyperledger.besu.ethereum.mainnet.requests.RequestUtil;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 import org.hyperledger.besu.plugin.services.exception.StorageException;
 
 import java.security.InvalidParameterException;

diff --git a/.../hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/ExecutionWitnessParameter.java b/.../hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/ExecutionWitnessParameter.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;

diff --git a/...java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/IPAProofParameter.java b/...java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/IPAProofParameter.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
 import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
-import org.hyperledger.besu.ethereum.trie.verkle.IPAProof;
+import org.hyperledger.besu.ethereum.core.witness.IPAProof;
 
 import java.util.List;
 
@@ -52,7 +52,7 @@ public static IPAProofParameter fromIPAProof(final IPAProof ipaProof) {
   }
 
   public static IPAProof toIPAProof(final IPAProofParameter ipaProofParameter) {
-    return new org.hyperledger.besu.ethereum.trie.verkle.IPAProof(
+    return new IPAProof(
         ipaProofParameter.getCl().stream().map(Bytes32::fromHexString).toList(),
         ipaProofParameter.getCr().stream().map(Bytes32::fromHexString).toList(),
         ipaProofParameter.getFinalEvaluation());

diff --git a/...ava/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StateDiffParameter.java b/...ava/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StateDiffParameter.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
-import org.hyperledger.besu.ethereum.trie.verkle.StateDiff;
+import org.hyperledger.besu.ethereum.core.witness.StateDiff;
 
 import java.util.List;
 

diff --git a/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StemStateDiffParameter.java b/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/StemStateDiffParameter.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
 import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
-import org.hyperledger.besu.ethereum.trie.verkle.StemStateDiff;
+import org.hyperledger.besu.ethereum.core.witness.StemStateDiff;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...g/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/SuffixStateDiffParameter.java b/...g/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/SuffixStateDiffParameter.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
 import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
-import org.hyperledger.besu.ethereum.trie.verkle.SuffixStateDiff;
+import org.hyperledger.besu.ethereum.core.witness.SuffixStateDiff;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...a/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/VerkleProofParameter.java b/...a/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/VerkleProofParameter.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
 import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
-import org.hyperledger.besu.ethereum.trie.verkle.VerkleProof;
+import org.hyperledger.besu.ethereum.core.witness.VerkleProof;
 
 import java.util.List;
 
@@ -51,7 +51,7 @@ public VerkleProofParameter(
   }
 
   public static VerkleProofParameter fromVerkleProof(
-      final org.hyperledger.besu.ethereum.trie.verkle.VerkleProof verkleProof) {
+      final VerkleProof verkleProof) {
     return new VerkleProofParameter(
         verkleProof.otherStems().stream().map(Bytes::toHexString).toList(),
         verkleProof.depthExtensionPresent(),

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java
@@ -18,9 +18,9 @@
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.Objects;

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java
@@ -23,7 +23,7 @@
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.time.Instant;

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java
@@ -18,7 +18,7 @@
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.Optional;

diff --git a/...thereum/trie/verkle/ExecutionWitness.java → ...hereum/core/witness/ExecutionWitness.java b/...thereum/trie/verkle/ExecutionWitness.java → ...hereum/core/witness/ExecutionWitness.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 

diff --git a/...r/besu/ethereum/trie/verkle/IPAProof.java → .../besu/ethereum/core/witness/IPAProof.java b/...r/besu/ethereum/trie/verkle/IPAProof.java → .../besu/ethereum/core/witness/IPAProof.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import java.util.List;
 

diff --git a/.../besu/ethereum/trie/verkle/StateDiff.java → ...besu/ethereum/core/witness/StateDiff.java b/.../besu/ethereum/trie/verkle/StateDiff.java → ...besu/ethereum/core/witness/StateDiff.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import java.util.List;
 

diff --git a/...u/ethereum/trie/verkle/StemStateDiff.java → .../ethereum/core/witness/StemStateDiff.java b/...u/ethereum/trie/verkle/StemStateDiff.java → .../ethereum/core/witness/StemStateDiff.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import java.util.List;
 

diff --git a/...ethereum/trie/verkle/SuffixStateDiff.java → ...thereum/core/witness/SuffixStateDiff.java b/...ethereum/trie/verkle/SuffixStateDiff.java → ...thereum/core/witness/SuffixStateDiff.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import org.apache.tuweni.bytes.Bytes32;
 

diff --git a/...esu/ethereum/trie/verkle/VerkleProof.java → ...su/ethereum/core/witness/VerkleProof.java b/...esu/ethereum/trie/verkle/VerkleProof.java → ...su/ethereum/core/witness/VerkleProof.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie.verkle;
+package org.hyperledger.besu.ethereum.core.witness;
 
 import java.util.List;
 

diff --git a/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ExecutionWitnessValidator.java b/...m/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ExecutionWitnessValidator.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.trie.verkle.ExecutionWitness;
+import org.hyperledger.besu.ethereum.core.witness.ExecutionWitness;
 
 import java.util.Optional;
 

diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java b/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
@@ -502,7 +502,7 @@ public TransactionProcessingResult processTransaction(
 
       initialFrame.getSelfDestructs().forEach(worldState::deleteAccount);
 
-      clearEmptyAccountStrategy.process(worldUpdater);
+      clearEmptyAccountStrategy.process(worldState);
 
       if (initialFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
         return TransactionProcessingResult.successful(

diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
@@ -70,7 +70,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'xU0LMvStiFihBKBxkfNHB7oIg0PUHWkPuv2yt1GVC94='
+  knownHash = 'pXUnzOxMq+cCmmaS39fa2nHlZWQm2wqYxU2nNSDdNfs='
 }
 check.dependsOn('checkAPIChanges')
 

diff --git a/...ins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/Utils.java b/...ins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/Utils.java
@@ -86,6 +86,7 @@ private static int dataStorageFormatToV1(final DataStorageFormat dataStorageForm
     return switch (dataStorageFormat) {
       case FOREST -> 1;
       case BONSAI -> 2;
+      case VERKLE -> 3;
     };
   }
 }