depolymerization

commit 87a6363582cf58e8fbefaeb0fdff59ee068237af
parent 638b7383208cb0b80f52b0d7f50b9a044a4939d4
Author: Antoine A <>
Date:   Thu, 24 Feb 2022 13:13:19 +0100

btc-wire: reconnect on auto wallet rpc refresh

Diffstat:
M
Cargo.lock
 | 
24
++++++++++++------------
M
btc-wire/src/main.rs
 | 
2
--
M
btc-wire/src/rpc.rs
 | 
3
+++

3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -124,7 +124,7 @@ dependencies = [
  "base64",
  "bech32",
  "bitcoin",
- "clap 3.1.1",
+ "clap 3.1.2",
  "common",
  "criterion",
  "hex",
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.1.1"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
+checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77"
 dependencies = [
  "atty",
  "bitflags",
@@ -223,9 +223,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.1.0"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd1122e63869df2cb309f449da1ad54a7c6dfeb7c7e6ccd8e0825d9eb93bb72"
+checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -497,7 +497,7 @@ dependencies = [
 name = "eth-wire"
 version = "0.1.0"
 dependencies = [
- "clap 3.1.1",
+ "clap 3.1.2",
  "common",
  "ethereum-types",
  "hex",
@@ -703,9 +703,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
  "cfg-if",
  "libc",
@@ -890,7 +890,7 @@ version = "0.1.0"
 dependencies = [
  "bitcoin",
  "btc-wire",
- "clap 3.1.1",
+ "clap 3.1.2",
  "common",
  "eth-wire",
  "ureq",
@@ -1546,9 +1546,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7"
+checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d"
 
 [[package]]
 name = "serde"
@@ -2169,7 +2169,7 @@ name = "wire-gateway"
 version = "0.1.0"
 dependencies = [
  "bitcoin",
- "clap 3.1.1",
+ "clap 3.1.2",
  "common",
  "deadpool-postgres",
  "ethereum-types",
diff --git a/btc-wire/src/main.rs b/btc-wire/src/main.rs
@@ -199,8 +199,6 @@ fn run(config: Option<PathBuf>) {
         config,
     }));
 
-    let mut rpc = Rpc::common(&btc_config).unwrap();
-    rpc.load_wallet(WIRE_WALLET_NAME).ok();
     let rpc_watcher = auto_rpc_common(btc_config.clone());
     let rpc_analysis = auto_rpc_common(btc_config.clone());
     let rpc_worker = auto_rpc_wallet(btc_config, WIRE_WALLET_NAME);
diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
@@ -46,6 +46,9 @@ pub fn auto_rpc_wallet(config: BitcoinConfig, wallet: &'static str) -> AutoRpcWa
             let mut rpc = Rpc::wallet(config, wallet)
                 .map_err(|err| error!("connect RPC: {}", err))
                 .ok()?;
+            rpc.load_wallet(wallet)
+                .map_err(|err| error!("connect RPC: {}", err))
+                .ok()?;
             rpc.unlock_wallet(&password())
                 .map_err(|err| error!("connect RPC: {}", err))
                 .ok()?;