From de9376ecc76fb0bb1b71a9bfbe5d01a0352be715 Mon Sep 17 00:00:00 2001 From: "S. Matthew English" Date: Thu, 25 Apr 2019 13:02:32 -0400 Subject: [PATCH] update --- .../pantheon/ethereum/eth/transactions/TransactionPool.java | 4 ++++ .../src/main/java/tech/pegasys/pantheon/RunnerBuilder.java | 2 ++ .../java/tech/pegasys/pantheon/cli/PantheonCommandTest.java | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java index 07fdf82d4d..e77e0d7ead 100644 --- a/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java +++ b/ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/transactions/TransactionPool.java @@ -86,6 +86,10 @@ private void handleConnect(final EthPeer peer) { } } + public void setMaximumPendingTransactionsRetentionPeriod(String value) { + System.out.println("value: " + value + " <-- 999"); + } + public List getLocalTransactions() { return pendingTransactions.getLocalTransactions(); } diff --git a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java b/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java index 583f9c9c6e..9708edbafb 100644 --- a/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java +++ b/pantheon/src/main/java/tech/pegasys/pantheon/RunnerBuilder.java @@ -304,6 +304,8 @@ public Runner build() { networkRunner.getNetwork(), getSelfEnode(), bootnodesAsEnodeURLs))); final TransactionPool transactionPool = pantheonController.getTransactionPool(); + transactionPool.setMaximumPendingTransactionsRetentionPeriod(pendingTransactionRetentionPeriod); + final MiningCoordinator miningCoordinator = pantheonController.getMiningCoordinator(); final Optional accountWhitelistController = localPermissioningConfiguration diff --git a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java index 6332341ee2..9f84241283 100644 --- a/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java +++ b/pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java @@ -2351,7 +2351,7 @@ public void errorIsRaisedIfStaticNodesAreNotWhitelisted() throws IOException { // retention-period-pending-tx @Test - public void specifyMaximumPendingTransactionsTimePeriod() { + public void specifyMaximumPendingTransactionsRetentionPeriod() { parseCommand("--pending-tx-retention-period", "0h0m0s");