Revert plugin interface to return object instead of list

Signed-off-by: Gabriel-Trintinalia <[email protected]>
Gabriel-Trintinalia · Oct 6, 2023 · a2a3236 · a2a3236
1 parent 0b83ab5
commit a2a3236
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...ava/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java b/...ava/org/hyperledger/besu/ethereum/blockcreation/txselection/BlockTransactionSelector.java
@@ -46,6 +46,7 @@
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -118,7 +119,8 @@ public BlockTransactionSelector(
             transactionPool);
     transactionSelectors = createTransactionSelectors(blockSelectionContext);
     externalTransactionSelectors =
-        transactionSelectorFactory.map(TransactionSelectorFactory::create).orElse(List.of());
+        createExternalTransactionSelectors(
+            transactionSelectorFactory.map(List::of).orElseGet(List::of));
   }
 
   /**
@@ -324,4 +326,11 @@ private List<AbstractTransactionSelector> createTransactionSelectors(
         new BlobPriceTransactionSelector(context),
         new ProcessingResultTransactionSelector(context));
   }
+
+  private List<TransactionSelector> createExternalTransactionSelectors(
+      final List<TransactionSelectorFactory> transactionSelectorFactory) {
+    return transactionSelectorFactory.stream()
+        .map(TransactionSelectorFactory::create)
+        .collect(Collectors.toList());
+  }
 }
diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
@@ -69,7 +69,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 = 'IPqcFdM1uy+ZDbcvzsKxMIrzhP9VoaSeanhBOLtbhfE='
+  knownHash = 'n7Nr+J78ImUPzFxTa6Ig5C7Ul4nSM+AZnsLGQY0dL60='
 }
 check.dependsOn('checkAPIChanges')
 

diff --git a/...ain/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelectorFactory.java b/...ain/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelectorFactory.java
@@ -17,8 +17,6 @@
 
 import org.hyperledger.besu.plugin.Unstable;
 
-import java.util.List;
-
 /** Interface for a factory that creates transaction selectors */
 @Unstable
 public interface TransactionSelectorFactory {
@@ -28,5 +26,5 @@ public interface TransactionSelectorFactory {
    *
    * @return the transaction selector list
    */
-  List<TransactionSelector> create();
+  TransactionSelector create();
 }