wip

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
fab-10 · Oct 24, 2023 · a87aa2d · a87aa2d
1 parent 315928e
commit a87aa2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java b/...ava/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -29,7 +29,6 @@
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.datatypes.PendingTransaction;
 import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.GasLimitCalculator;
@@ -56,6 +55,7 @@
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
@@ -570,7 +570,7 @@ public void transactionSelectionPluginShouldWork_PreProcessing() {
             new PluginTransactionSelector() {
               @Override
               public TransactionSelectionResult evaluateTransactionPreProcessing(
-                  final PendingTransaction pendingTransaction) {
+                  final org.hyperledger.besu.datatypes.PendingTransaction pendingTransaction) {
                 if (pendingTransaction.getTransaction().equals(notSelectedTransient))
                   return TransactionSelectionResult.invalidTransient("transient");
                 if (pendingTransaction.getTransaction().equals(notSelectedInvalid))
@@ -580,7 +580,7 @@ public TransactionSelectionResult evaluateTransactionPreProcessing(
 
               @Override
               public TransactionSelectionResult evaluateTransactionPostProcessing(
-                  final PendingTransaction pendingTransaction,
+                  final org.hyperledger.besu.datatypes.PendingTransaction pendingTransaction,
                   final org.hyperledger.besu.plugin.data.TransactionProcessingResult
                       processingResult) {
                 return TransactionSelectionResult.SELECTED;
@@ -632,13 +632,13 @@ public void transactionSelectionPluginShouldWork_PostProcessing() {
             new PluginTransactionSelector() {
               @Override
               public TransactionSelectionResult evaluateTransactionPreProcessing(
-                  final PendingTransaction pendingTransaction) {
+                  final org.hyperledger.besu.datatypes.PendingTransaction pendingTransaction) {
                 return TransactionSelectionResult.SELECTED;
               }
 
               @Override
               public TransactionSelectionResult evaluateTransactionPostProcessing(
-                  final PendingTransaction pendingTransaction,
+                  final org.hyperledger.besu.datatypes.PendingTransaction pendingTransaction,
                   final org.hyperledger.besu.plugin.data.TransactionProcessingResult
                       processingResult) {
                 // the transaction with max gas +1 should fail
@@ -875,10 +875,7 @@ private BlockHeader blockHeader(final long number) {
     return new BlockHeaderTestFixture().number(number).buildHeader();
   }
 
-  protected BiFunction<
-          org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction,
-          org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction,
-          Boolean>
+  protected BiFunction<PendingTransaction, PendingTransaction, Boolean>
       createTransactionReplacementTester(final TransactionPoolConfiguration poolConf) {
     final TransactionPoolReplacementHandler transactionReplacementHandler =
         new TransactionPoolReplacementHandler(poolConf.getPriceBump());

diff --git a/...g/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementAlwaysReplaceRule.java b/...g/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementAlwaysReplaceRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at