From fc7429ff7592fd33d83d744802516b7bbd559ed2 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 1 Nov 2022 14:25:53 +0200 Subject: [PATCH] Disable BitcoinWalletService initialization --- .../java/bisq/application/DefaultApplicationService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/application/src/main/java/bisq/application/DefaultApplicationService.java b/application/src/main/java/bisq/application/DefaultApplicationService.java index 075d0451aa..23e26cdd31 100644 --- a/application/src/main/java/bisq/application/DefaultApplicationService.java +++ b/application/src/main/java/bisq/application/DefaultApplicationService.java @@ -32,7 +32,6 @@ import bisq.settings.SettingsService; import bisq.support.SupportService; import bisq.user.UserService; -import bisq.wallets.bitcoind.BitcoinWalletService; import bisq.wallets.elementsd.LiquidWalletService; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -63,7 +62,6 @@ public enum State { INITIALIZE_FAILED } - private final BitcoinWalletService bitcoinWalletService; private final LiquidWalletService liquidWalletService; private final SecurityService securityService; private final NetworkService networkService; @@ -82,7 +80,6 @@ public enum State { public DefaultApplicationService(String[] args) { super("default", args); - bitcoinWalletService = new BitcoinWalletService(persistenceService, config.isBitcoindRegtest()); liquidWalletService = new LiquidWalletService(persistenceService, config.isElementsdRegtest()); securityService = new SecurityService(persistenceService); @@ -126,8 +123,7 @@ public DefaultApplicationService(String[] args) { // At the moment we do not initialize in parallel to keep thing simple, but can be optimized later @Override public CompletableFuture initialize() { - return bitcoinWalletService.initialize() - .thenCompose(result -> liquidWalletService.initialize()) + return liquidWalletService.initialize() .thenCompose(result -> securityService.initialize()) .whenComplete((r, t) -> setState(State.START_NETWORK)) .thenCompose(result -> networkService.initialize()) @@ -168,7 +164,6 @@ public CompletableFuture shutdown() { .thenCompose(result -> networkService.shutdown()) .thenCompose(result -> securityService.shutdown()) .thenCompose(result -> liquidWalletService.shutdown()) - .thenCompose(result -> bitcoinWalletService.shutdown()) .orTimeout(10, TimeUnit.SECONDS) .handle((result, throwable) -> throwable == null) .join(),