Remove redundant methods to set the extra data

Signed-off-by: Fabio Di Fabio <[email protected]>
hyperledger · May 8, 2024 · 8ff0040 · 8ff0040
1 parent da37511
commit 8ff0040
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 72 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java b/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java
@@ -136,7 +136,7 @@ private void setOptionalFields(
       // For simplicity only set these for PoW consensus algorithms.
       // Other consensus algorithms use these fields for special purposes or ignore them.
       miner.setCoinbase(blockData.getCoinbase().orElse(Address.ZERO));
-      miner.setExtraData(blockData.getExtraData().orElse(Bytes.EMPTY));
+      controller.getMiningParameters().setExtraData(blockData.getExtraData().orElse(Bytes.EMPTY));
     } else if (blockData.getCoinbase().isPresent() || blockData.getExtraData().isPresent()) {
       // Fail if these fields are set for non-ethash chains
       final Stream.Builder<String> fields = Stream.builder();

diff --git a/...est/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java b/...est/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java
@@ -200,7 +200,7 @@ public void shouldUseLatestVanityData() {
             null,
             ethScheduler);
 
-    executor.setExtraData(modifiedVanityData);
+    miningParameters.setExtraData(modifiedVanityData);
     final Bytes extraDataBytes = executor.calculateExtraData(blockHeaderBuilder.buildHeader());
 
     final CliqueExtraData cliqueExtraData =

diff --git a/...ommon/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java b/...ommon/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java
@@ -29,7 +29,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.tuweni.bytes.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -108,11 +107,6 @@ public Wei getMinPriorityFeePerGas() {
     return activeMiningCoordinator.getMinPriorityFeePerGas();
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    activeMiningCoordinator.setExtraData(extraData);
-  }
-
   @Override
   public Optional<Address> getCoinbase() {
     return activeMiningCoordinator.getCoinbase();

diff --git a/.../java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreatorFactory.java b/.../java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreatorFactory.java
@@ -124,16 +124,6 @@ public BlockCreator create(final BlockHeader parentHeader, final int round) {
         ethScheduler);
   }
 
-  /**
-   * Sets extra data.
-   *
-   * @param extraData the extra data
-   */
-  public void setExtraData(final Bytes extraData) {
-
-    miningParameters.setExtraData(extraData.copy());
-  }
-
   /**
    * Sets min transaction gas price.
    *

diff --git a/...in/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java b/...in/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java
@@ -33,7 +33,6 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,11 +153,6 @@ public Wei getMinPriorityFeePerGas() {
     return blockCreatorFactory.getMinPriorityFeePerGas();
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    blockCreatorFactory.setExtraData(extraData);
-  }
-
   @Override
   public Optional<Address> getCoinbase() {
     return Optional.of(blockCreatorFactory.getLocalAddress());

diff --git a/...n/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java b/...n/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java
@@ -40,7 +40,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -162,11 +161,6 @@ public void delegatesToActiveMiningCoordinator() {
         coordinator2,
         coordinator1);
 
-    verifyDelegation(
-        c -> c.setExtraData(Bytes.EMPTY), GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
-    verifyDelegation(
-        c -> c.setExtraData(Bytes.EMPTY), MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
-
     verifyDelegation(
         MiningCoordinator::getCoinbase, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
     verifyDelegation(

diff --git a/...ava/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java b/...ava/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java
@@ -35,7 +35,6 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -89,13 +88,6 @@ public void getsMinTransactionGasPrice() {
     assertThat(bftMiningCoordinator.getMinTransactionGasPrice()).isEqualTo(minGasPrice);
   }
 
-  @Test
-  public void setsTheExtraData() {
-    final Bytes extraData = Bytes.fromHexStringLenient("0x1234");
-    bftMiningCoordinator.setExtraData(extraData);
-    verify(bftBlockCreatorFactory).setExtraData(extraData);
-  }
-
   @Test
   public void addsNewChainHeadEventWhenNewCanonicalHeadBlockEventReceived() throws Exception {
     BlockAddedEvent headAdvancement =

diff --git a/...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java b/...ge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
@@ -61,7 +61,6 @@
 import java.util.function.Supplier;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -225,11 +224,6 @@ public Wei getMinPriorityFeePerGas() {
     return miningParameters.getMinPriorityFeePerGas();
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    this.miningParameters.setExtraData(extraData);
-  }
-
   @Override
   public Optional<Address> getCoinbase() {
     return miningParameters.getCoinbase();

diff --git a/...c/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/...c/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java
@@ -33,7 +33,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
 /** The Transition coordinator. */
@@ -107,12 +106,6 @@ public Wei getMinPriorityFeePerGas() {
     return dispatchFunctionAccordingToMergeState(MiningCoordinator::getMinPriorityFeePerGas);
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    miningCoordinator.setExtraData(extraData);
-    mergeCoordinator.setExtraData(extraData);
-  }
-
   @Override
   public Optional<Address> getCoinbase() {
     return dispatchFunctionAccordingToMergeState(MiningCoordinator::getCoinbase);

diff --git a/...tion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java b/...tion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,10 +97,6 @@ public abstract M createMiner(
       final Subscribers<PoWObserver> ethHashObservers,
       final BlockHeader parentHeader);
 
-  public void setExtraData(final Bytes extraData) {
-    miningParameters.setExtraData(extraData.copy());
-  }
-
   public void setMinTransactionGasPrice(final Wei minTransactionGasPrice) {
     miningParameters.setMinTransactionGasPrice(minTransactionGasPrice);
   }

diff --git a/.../src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java b/.../src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
@@ -32,8 +32,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.tuweni.bytes.Bytes;
-
 public abstract class AbstractMiningCoordinator<
         M extends BlockMiner<? extends AbstractBlockCreator>>
     implements BlockAddedObserver, MiningCoordinator {
@@ -212,11 +210,6 @@ public Wei getMinPriorityFeePerGas() {
     return executor.getMinPriorityFeePerGas();
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    executor.setExtraData(extraData);
-  }
-
   @Override
   public Optional<Address> getCoinbase() {
     return executor.getCoinbase();

diff --git a/...creation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java b/...creation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java
@@ -26,8 +26,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.tuweni.bytes.Bytes;
-
 public interface MiningCoordinator {
 
   void start();
@@ -60,8 +58,6 @@ default void onPauseMining() {}
 
   Wei getMinPriorityFeePerGas();
 
-  void setExtraData(Bytes extraData);
-
   default void setCoinbase(final Address coinbase) {
     throw new UnsupportedOperationException(
         "Current consensus mechanism prevents setting coinbase.");

diff --git a/...tion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java b/...tion/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.tuweni.bytes.Bytes;
-
 public class NoopMiningCoordinator implements MiningCoordinator {
 
   private final MiningParameters miningParameters;
@@ -68,9 +66,6 @@ public Wei getMinPriorityFeePerGas() {
     return miningParameters.getMinPriorityFeePerGas();
   }
 
-  @Override
-  public void setExtraData(final Bytes extraData) {}
-
   @Override
   public Optional<Address> getCoinbase() {
     return miningParameters.getCoinbase();