spotless

Signed-off-by: Justin Florentine <[email protected]>
jflo · Nov 8, 2023 · 112936e · 112936e
1 parent 3cc7fbc
commit 112936e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 34 deletions.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
@@ -1097,23 +1097,23 @@ public static class Builder {
     private BlobsWithCommitments blobsWithCommitments;
 
     public Builder copiedFrom(final Transaction toCopy) {
-        this.transactionType = toCopy.transactionType;
-        this.nonce = toCopy.nonce;
-        this.gasPrice = toCopy.gasPrice.orElse(null);
-        this.maxPriorityFeePerGas = toCopy.maxPriorityFeePerGas.orElse(null);
-        this.maxFeePerGas = toCopy.maxFeePerGas.orElse(null);
-        this.maxFeePerBlobGas = toCopy.maxFeePerBlobGas.orElse(null);
-        this.gasLimit = toCopy.gasLimit;
-        this.to = toCopy.to;
-        this.value = toCopy.value;
-        this.signature = toCopy.signature;
-        this.payload = toCopy.payload;
-        this.accessList = toCopy.maybeAccessList;
-        this.sender = toCopy.sender;
-        this.chainId = toCopy.chainId;
-        this.versionedHashes = toCopy.versionedHashes.orElse(null);
-        this.blobsWithCommitments = toCopy.blobsWithCommitments.orElse(null);
-        return this;
+      this.transactionType = toCopy.transactionType;
+      this.nonce = toCopy.nonce;
+      this.gasPrice = toCopy.gasPrice.orElse(null);
+      this.maxPriorityFeePerGas = toCopy.maxPriorityFeePerGas.orElse(null);
+      this.maxFeePerGas = toCopy.maxFeePerGas.orElse(null);
+      this.maxFeePerBlobGas = toCopy.maxFeePerBlobGas.orElse(null);
+      this.gasLimit = toCopy.gasLimit;
+      this.to = toCopy.to;
+      this.value = toCopy.value;
+      this.signature = toCopy.signature;
+      this.payload = toCopy.payload;
+      this.accessList = toCopy.maybeAccessList;
+      this.sender = toCopy.sender;
+      this.chainId = toCopy.chainId;
+      this.versionedHashes = toCopy.versionedHashes.orElse(null);
+      this.blobsWithCommitments = toCopy.blobsWithCommitments.orElse(null);
+      return this;
     }
 
     public Builder type(final TransactionType transactionType) {

diff --git a/...core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java b/...core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
@@ -85,9 +85,10 @@ public Transaction createTransaction(final KeyPair keys) {
         builder.maxFeePerGas(maxFeePerGas.orElse(Wei.of(5000)));
         builder.accessList(accessListEntries.orElse(List.of()));
         builder.maxFeePerBlobGas(maxFeePerBlobGas.orElse(Wei.ONE));
-        if(blobs.isPresent()) {
-          builder.kzgBlobs(blobs.get().getKzgCommitments(), blobs.get().getBlobs(), blobs.get().getKzgProofs());
-        } else if(versionedHashes.isPresent()){
+        if (blobs.isPresent()) {
+          builder.kzgBlobs(
+              blobs.get().getKzgCommitments(), blobs.get().getBlobs(), blobs.get().getKzgProofs());
+        } else if (versionedHashes.isPresent()) {
           builder.versionedHashes(versionedHashes.get());
         }
         break;

diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java
@@ -20,15 +20,13 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.DelegatingBytes;
-import org.apache.tuweni.bytes.MutableBytes;
 import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SignatureAlgorithm;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.AccessListEntry;
 import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
 import java.math.BigInteger;
 import java.util.List;
@@ -38,8 +36,6 @@
 import java.util.stream.Stream;
 
 import com.google.common.base.Suppliers;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 import org.junit.jupiter.api.Test;
 
 public class TransactionBuilderTest {

diff --git a/...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java b/...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
@@ -245,7 +245,7 @@ private ValidationResult<TransactionInvalidReason> addTransaction(
     // from cache.
     if (transaction.getType().supportsBlob() && transaction.getBlobsWithCommitments().isEmpty()) {
       final Optional<Transaction> maybeCachedBlob = pendingTransactions.restoreBlob(transaction);
-      if(maybeCachedBlob.isPresent()) {
+      if (maybeCachedBlob.isPresent()) {
         toAdd = maybeCachedBlob.get();
       }
     }

diff --git a/...ava/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractTransactionsLayer.java b/...ava/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractTransactionsLayer.java
@@ -25,7 +25,6 @@
 import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.REPLACED;
 
 import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.datatypes.Blob;
 import org.hyperledger.besu.datatypes.BlobsWithCommitments;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;

diff --git a/...va/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java b/...va/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
@@ -541,8 +541,9 @@ public synchronized String logStats() {
   public Optional<Transaction> restoreBlob(final Transaction transaction) {
     Transaction.Builder txBuilder = Transaction.builder();
     txBuilder.copiedFrom(transaction);
-    final BlobsWithCommitments bwc = prioritizedTransactions.getBlobCache().getIfPresent(transaction.getHash());
-    if(bwc != null) {
+    final BlobsWithCommitments bwc =
+        prioritizedTransactions.getBlobCache().getIfPresent(transaction.getHash());
+    if (bwc != null) {
       txBuilder.blobsWithCommitments(bwc);
       return Optional.of(txBuilder.build());
     } else {

diff --git a/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java b/.../hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java
@@ -553,7 +553,7 @@ public Optional<Transaction> restoreBlob(final Transaction transaction) {
     Transaction.Builder txBuilder = Transaction.builder();
     txBuilder.copiedFrom(transaction);
     final BlobsWithCommitments bwc = blobCache.getIfPresent(transaction.getHash());
-    if(bwc != null) {
+    if (bwc != null) {
       txBuilder.blobsWithCommitments(bwc);
       return Optional.of(txBuilder.build());
     } else {

diff --git a/.../hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java b/.../hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java
@@ -17,7 +17,6 @@
 import static java.util.Comparator.comparing;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
@@ -26,7 +25,6 @@
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.NavigableSet;
-import java.util.Optional;
 import java.util.TreeSet;
 import java.util.function.Supplier;
 
@@ -59,7 +57,6 @@ public void reset() {
     prioritizedTransactions.clear();
   }
 
-
   @Override
   public void manageBlockAdded(final BlockHeader blockHeader) {
     // nothing to do
@@ -84,5 +81,4 @@ protected void removePrioritizedTransaction(final PendingTransaction removedPend
   protected PendingTransaction getLeastPriorityTransaction() {
     return prioritizedTransactions.last();
   }
-
 }