dirty fix for eth tests and other improvements

2 files changed, 3 insertions, 1 deletions

diff --git a/btc-wire/src/main.rs b/btc-wire/src/main.rs
index 16d52a4..53ec673 100644
--- a/btc-wire/src/main.rs
+++ b/btc-wire/src/main.rs
@@ -110,6 +110,7 @@ fn init(config: Option<PathBuf>, init: Init) -> LoopResult<()> {
             rpc.load_wallet(WIRE_WALLET_NAME).ok();

 

             // Load previous address

+            // TODO Use address label instead of the database ?

             let prev_addr = db.query_opt("SELECT value FROM state WHERE name = 'addr'", &[])?;

             let addr = if let Some(row) = prev_addr {

                 sql_addr(&row, 0)

@@ -158,6 +159,7 @@ fn run(config: Option<PathBuf>) {
         Network::Regtest => "regtest",

     };

     info!("Running on {} chain", chain_name);

+    // TODO Check wire wallet own config PAYTO address

 

     let rpc_watcher = auto_rpc_common(state.btc_config.clone());

     let rpc_analysis = auto_rpc_common(state.btc_config.clone());

diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
index 786d21c..9aed519 100644
--- a/btc-wire/src/rpc.rs
+++ b/btc-wire/src/rpc.rs
@@ -47,7 +47,7 @@ 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).ok();
+            rpc.load_wallet(wallet).ok(); 
             rpc.unlock_wallet(&password())
                 .map_err(|err| error!("connect RPC: {}", err))
                 .ok()?;