Fix test and log errors

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
hyperledger · Jun 28, 2023 · 3717795 · 3717795
1 parent 825d6f6
commit 3717795
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
@@ -128,7 +128,8 @@ public void setup() {
     when(besuController.getNodeKey()).thenReturn(nodeKey);
     when(besuController.getMiningParameters()).thenReturn(mock(MiningParameters.class));
     when(besuController.getPrivacyParameters()).thenReturn(mock(PrivacyParameters.class));
-    when(besuController.getTransactionPool()).thenReturn(mock(TransactionPool.class));
+    when(besuController.getTransactionPool())
+        .thenReturn(mock(TransactionPool.class, RETURNS_DEEP_STUBS));
     when(besuController.getSynchronizer()).thenReturn(mock(Synchronizer.class));
     when(besuController.getMiningCoordinator()).thenReturn(mock(MiningCoordinator.class));
     when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));

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
@@ -531,7 +531,13 @@ public CompletableFuture<Void> setEnabled() {
       isPoolEnabled.set(true);
       subscribeConnectId =
           OptionalLong.of(ethContext.getEthPeers().subscribeConnect(this::handleConnect));
-      return saveRestoreManager.loadFromDisk();
+      return saveRestoreManager
+          .loadFromDisk()
+          .exceptionally(
+              t -> {
+                LOG.error("Error while restoring transaction pool from disk", t);
+                return null;
+              });
     }
     return CompletableFuture.completedFuture(null);
   }
@@ -543,7 +549,13 @@ public CompletableFuture<Void> setDisabled() {
       pendingTransactionsListenersProxy.unsubscribe();
       final PendingTransactions pendingTransactionsToSave = pendingTransactions;
       pendingTransactions = new DisabledPendingTransactions();
-      return saveRestoreManager.saveToDisk(pendingTransactionsToSave);
+      return saveRestoreManager
+          .saveToDisk(pendingTransactionsToSave)
+          .exceptionally(
+              t -> {
+                LOG.error("Error while saving transaction pool to disk", t);
+                return null;
+              });
     }
     return CompletableFuture.completedFuture(null);
   }