Merge pull request #537 from alvasw/disable_bitcoin_core_wallet_initi…

…alization Disable BitcoinWalletService initialization
bisq-network · Nov 4, 2022 · fa1c773 · fa1c773
2 parents e2a5645 + fc7429f
commit fa1c773
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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<Boolean> 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<Boolean> 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(),