Merge rust-bitcoin#614: integration_test: Add explicit types everywhere

a71ad20 integration_test: Add explicit types everywhere (Alexey Gradoboev)

Pull request description:

  - adding explicit re-exported types in tests excluding suffixed by _core

  Fixes rust-bitcoin#612

ACKs for top commit:
  tcharding:
    ACK a71ad20

Tree-SHA512: b6cdbe378bdd94bbe1300441127f392956770b32a8e411a2a2963cf0f6360e1de7dea868711e650ee1a7a05ea82f1a58c49f25cb556056697302b5dca58e3de2

Author: tcharding

integration_test/tests/generating.rs

@@ -110,7 +110,7 @@ fn generating__invalidate_block() {
         node.client.get_best_block_hash().expect("getbestblockhash").into_model().unwrap().0;
     assert_ne!(old_best_block, new_best_block);
 
-    node.client.invalidate_block(new_best_block).expect("invalidateblock");
+    let _: () = node.client.invalidate_block(new_best_block).expect("invalidateblock");
 
     let json: GetBestBlockHash = node.client.get_best_block_hash().expect("getbestblockhash");
     let model: Result<mtype::GetBestBlockHash, hex::HexToArrayError> = json.into_model();

integration_test/tests/hidden.rs

@@ -245,7 +245,7 @@ fn hidden__reconsider_block() {
         "height should decrease by 1 after invalidating the tip block"
     );
 
-    node.client.reconsider_block(tip_before).expect("reconsiderblock");
+    let _: () = node.client.reconsider_block(tip_before).expect("reconsiderblock");
 
     let tip_after_reconsider =
         node.client.best_block_hash().expect("bestblockhash after reconsider");

integration_test/tests/wallet.rs

@@ -836,9 +836,10 @@ fn wallet__list_wallets__modelled() {
     node.client.create_wallet(wallet_2).expect("createwallet w2");
 
     let json: ListWallets = node.client.list_wallets().expect("listwallets");
+    let model: mtype::ListWallets = json.into_model();
 
-    assert!(json.0.iter().any(|w| w == wallet_1));
-    assert!(json.0.iter().any(|w| w == wallet_2));
+    assert!(model.0.iter().any(|w| w == wallet_1));
+    assert!(model.0.iter().any(|w| w == wallet_2));
 }
 
 #[test]
@@ -1181,7 +1182,8 @@ fn create_load_unload_wallet() {
     let node = BitcoinD::with_wallet(Wallet::None, &[]);
 
     let wallet = format!("wallet-{}", rand::random::<u32>()).to_string();
-    node.client.create_wallet(&wallet).expect("failed to create wallet");
+    let json: CreateWallet = node.client.create_wallet(&wallet).expect("createwallet");
+    let _: mtype::CreateWallet = json.into_model();
 
     // Upto version 20 Core returns null for `unloadwallet`.
     #[cfg(feature = "v20_and_below")]
@@ -1194,7 +1196,8 @@ fn create_load_unload_wallet() {
         let _: mtype::UnloadWallet = json.into_model();
     }
 
-    let _: LoadWallet = node.client.load_wallet(&wallet).expect("loadwallet");
+    let json: LoadWallet = node.client.load_wallet(&wallet).expect("loadwallet");
+    let _: mtype::LoadWallet = json.into_model();
 }
 
 #[test]