updates

Author: sandipndev

client/src/client.rs

@@ -264,7 +264,7 @@ pub trait RpcApi: Sized {
         self.call("loadwallet", &[wallet.into()])
     }
 
-    fn unload_wallet(&self, wallet: Option<&str>) -> Result<json::UnloadWalletResult> {
+    fn unload_wallet(&self, wallet: Option<&str>) -> Result<()> {
         let mut args = [opt_into_json(wallet)?];
         self.call("unloadwallet", handle_defaults(&mut args, &[null()]))
     }
@@ -1168,10 +1168,7 @@ impl RpcApi for Client {
         if log_enabled!(Debug) {
             debug!(target: "bitcoincore_rpc", "JSON-RPC request: {} {}", cmd, serde_json::Value::from(args));
         }
-        println!("client req: {:?}", req);
         let resp = self.client.send_request(req).map_err(Error::from);
-        println!("client resp: {:?}", resp);
-        println!("client resp.result: {:?}", resp.as_ref().map(|r| r.result.as_ref()));
         log_response(cmd, &resp);
         Ok(resp?.result()?)
     }

integration_test/run.sh

@@ -19,16 +19,14 @@ PID1=$!
 sleep 3
 
 BLOCKFILTERARG=""
-if bitcoind -version | grep -q "v0\.\(19\|2\)"; then
+if bitcoind -version | grep -q "v\(0\.19\|0\.2\|2\)"; then
     BLOCKFILTERARG="-blockfilterindex=1"
 fi
-BLOCKFILTERARG="-blockfilterindex=1"
 
 FALLBACKFEEARG=""
-if bitcoind -version | grep -q "v0\.2"; then
+if bitcoind -version | grep -q "v\(0\.2\|2\)"; then
     FALLBACKFEEARG="-fallbackfee=0.00001000"
 fi
-FALLBACKFEEARG="-fallbackfee=0.00001000"
 
 bitcoind -regtest $BLOCKFILTERARG $FALLBACKFEEARG \
     -datadir=${TESTDIR}/2 \

integration_test/src/main.rs

@@ -1078,5 +1078,4 @@ fn test_descriptor_wallet(cl: &Client) {
         "tr(tprv8ZgxMBicQKsPeRBCAfUGsZhyHy9dwWyPqhSJmaMnMJQWWtt8L2SkTeHaiF82CUCGtiTiHAs3cMkjdKckGKiCWeYtvMPF1jDTWYTryRMicpx/86h/1h/0h/1/*)#7lqhlmnw",
     ).unwrap();
     cl.get_new_address(None, Some(json::AddressType::Bech32m)).unwrap();
-    cl.unload_wallet(Some("testdescriptorwallet")).unwrap();
 }

json/src/lib.rs

@@ -130,11 +130,6 @@ pub struct LoadWalletResult {
     pub warning: Option<String>,
 }
 
-#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
-pub struct UnloadWalletResult {
-    pub warning: Option<String>,
-}
-
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
 pub struct GetWalletInfoResult {
     #[serde(rename = "walletname")]