From aa3819241df6556707c797e95bfe1c261478391e Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 27 Feb 2024 21:58:44 +0100 Subject: [PATCH] Cleanup after refactoring TransactionSelectionService (#6618) Signed-off-by: Fabio Di Fabio --- .../dsl/node/ThreadBesuNodeRunner.java | 19 ++++++++----------- .../org/hyperledger/besu/cli/BesuCommand.java | 5 ----- .../controller/BesuControllerBuilder.java | 12 ------------ .../besu/cli/CommandTestAbstract.java | 1 - 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java index 2727c25e259..c4b36df2a92 100644 --- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java +++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java @@ -29,6 +29,7 @@ import org.hyperledger.besu.cryptoservices.NodeKey; import org.hyperledger.besu.ethereum.GasLimitCalculator; import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration; +import org.hyperledger.besu.ethereum.core.ImmutableMiningParameters; import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration; @@ -148,11 +149,16 @@ public void startNode(final BesuNode node) { new TransactionSelectionServiceImpl(); final Path dataDir = node.homeDirectory(); final BesuConfigurationImpl commonPluginConfiguration = new BesuConfigurationImpl(); + final var miningParameters = + ImmutableMiningParameters.builder() + .from(node.getMiningParameters()) + .transactionSelectionService(transactionSelectionServiceImpl) + .build(); commonPluginConfiguration.init( dataDir, dataDir.resolve(DATABASE_PATH), node.getDataStorageConfiguration(), - node.getMiningParameters()); + miningParameters); final BesuPluginContextImpl besuPluginContext = besuPluginContextMap.computeIfAbsent( node, @@ -199,15 +205,12 @@ public void startNode(final BesuNode node) { final int maxPeers = 25; - final TransactionSelectionService transactionSelectorService = - getTransactionSelectorService(besuPluginContext); - final PluginTransactionValidatorFactory pluginTransactionValidatorFactory = getPluginTransactionValidatorFactory(besuPluginContext); builder .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build()) .dataDirectory(node.homeDirectory()) - .miningParameters(node.getMiningParameters()) + .miningParameters(miningParameters) .privacyParameters(node.getPrivacyParameters()) .nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir)))) .metricsSystem(metricsSystem) @@ -226,7 +229,6 @@ public void startNode(final BesuNode node) { .maxRemotelyInitiatedPeers(15) .networkConfiguration(node.getNetworkingConfiguration()) .randomPeerPriority(false) - .transactionSelectorService(transactionSelectorService) .pluginTransactionValidatorFactory(pluginTransactionValidatorFactory); node.getGenesisConfig() @@ -338,11 +340,6 @@ public String getConsoleContents() { throw new RuntimeException("Console contents can only be captured in process execution"); } - private TransactionSelectionService getTransactionSelectorService( - final BesuPluginContextImpl besuPluginContext) { - return besuPluginContext.getService(TransactionSelectionService.class).orElseThrow(); - } - private PluginTransactionValidatorFactory getPluginTransactionValidatorFactory( final BesuPluginContextImpl besuPluginContext) { final Optional txValidatorService = diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java index d254cc0b0df..da9f086eeb0 100644 --- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java +++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java @@ -1791,7 +1791,6 @@ public BesuControllerBuilder getControllerBuilder() { .synchronizerConfiguration(buildSyncConfig()) .ethProtocolConfiguration(unstableEthProtocolOptions.toDomainObject()) .networkConfiguration(unstableNetworkingOptions.toDomainObject()) - .transactionSelectorService(getTransactionSelectorService()) .pluginTransactionValidatorFactory(getPluginTransactionValidatorFactory()) .dataDirectory(dataDir()) .dataStorageConfiguration(getDataStorageConfiguration()) @@ -1823,10 +1822,6 @@ public BesuControllerBuilder getControllerBuilder() { .cacheLastBlocks(numberOfblocksToCache); } - private TransactionSelectionService getTransactionSelectorService() { - return besuPluginContext.getService(TransactionSelectionService.class).orElseThrow(); - } - private PluginTransactionValidatorFactory getPluginTransactionValidatorFactory() { final Optional txSValidatorService = besuPluginContext.getService(PluginTransactionValidatorService.class); diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java index 3dd221514a6..81e172eadc1 100644 --- a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java +++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java @@ -97,7 +97,6 @@ import org.hyperledger.besu.evm.internal.EvmConfiguration; import org.hyperledger.besu.metrics.ObservableMetricsSystem; import org.hyperledger.besu.plugin.services.MetricsSystem; -import org.hyperledger.besu.plugin.services.TransactionSelectionService; import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider; import org.hyperledger.besu.plugin.services.storage.DataStorageFormat; import org.hyperledger.besu.plugin.services.txvalidator.PluginTransactionValidatorFactory; @@ -533,17 +532,6 @@ public BesuControllerBuilder randomPeerPriority(final Boolean randomPeerPriority return this; } - /** - * sets the transactionSelectionService in the builder - * - * @param transactionSelectionService the transaction selector service - * @return the besu controller builder - */ - public BesuControllerBuilder transactionSelectorService( - final TransactionSelectionService transactionSelectionService) { - return this; - } - /** * sets the pluginTransactionValidatorFactory * diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java index 271ed1b8155..3f41c1ec8ac 100644 --- a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java +++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java @@ -294,7 +294,6 @@ public void initMocks() throws Exception { when(mockControllerBuilder.maxPeers(anyInt())).thenReturn(mockControllerBuilder); when(mockControllerBuilder.maxRemotelyInitiatedPeers(anyInt())) .thenReturn(mockControllerBuilder); - when(mockControllerBuilder.transactionSelectorService(any())).thenReturn(mockControllerBuilder); when(mockControllerBuilder.pluginTransactionValidatorFactory(any())) .thenReturn(mockControllerBuilder); when(mockControllerBuilder.besuComponent(any(BesuComponent.class)))