From 1b63903ad36bc30425dda3b224ab74e2af070280 Mon Sep 17 00:00:00 2001
From: Sean Gilligan <sean@msgilligan.com>
Date: Sun, 1 Oct 2023 11:57:07 -0700
Subject: [PATCH] TestWithPeerGroup: remove unneeded use of
 `ListeningScheduledExecutorService`

There is no longer a need to decorate `ScheduledThreadPoolExecutor` to support
`ListeningScheduledExecutorService` since `PeerGroup` no longer uses it.
---
 .../java/org/bitcoinj/testing/TestWithPeerGroup.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/integration-test/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java b/integration-test/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
index 42b5dc8bc..1d45f4931 100644
--- a/integration-test/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
+++ b/integration-test/src/test/java/org/bitcoinj/testing/TestWithPeerGroup.java
@@ -16,8 +16,6 @@
 
 package org.bitcoinj.testing;
 
-import com.google.common.util.concurrent.ListeningScheduledExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import org.bitcoinj.base.internal.TimeUtils;
 import org.bitcoinj.core.BloomFilter;
 import org.bitcoinj.core.MemoryPoolMessage;
@@ -40,6 +38,7 @@ import org.junit.rules.Timeout;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.time.Duration;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.Semaphore;
@@ -115,8 +114,8 @@ public class TestWithPeerGroup extends TestWithNetworkConnections {
     private PeerGroup createPeerGroup(final ClientConnectionManager manager) {
         return new PeerGroup(UNITTEST, blockChain, manager, PeerGroup.DEFAULT_BLOOM_FILTER_FP_RATE) {
             @Override
-            protected ListeningScheduledExecutorService createPrivateExecutor() {
-                return MoreExecutors.listeningDecorator(new ScheduledThreadPoolExecutor(1, new ContextPropagatingThreadFactory("PeerGroup test thread")) {
+            protected ScheduledExecutorService createPrivateExecutor() {
+                return new ScheduledThreadPoolExecutor(1, new ContextPropagatingThreadFactory("PeerGroup test thread")) {
                     @Override
                     public ScheduledFuture<?> schedule(final Runnable command, final long delay, final TimeUnit unit) {
                         if (!blockJobs)
@@ -127,7 +126,7 @@ public class TestWithPeerGroup extends TestWithNetworkConnections {
                             jobBlocks.acquireUninterruptibly();
                         }, 0 /* immediate */, unit);
                     }
-                });
+                };
             }
         };
     }