Skip to content

integration_test: Add explicit types everywhere #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexgrad42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

integration_test: Add explicit types everywhere #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration_test/tests/generating.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion integration_test/tests/hidden.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,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");
Expand Down
11 changes: 7 additions & 4 deletions integration_test/tests/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,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]
Expand Down Expand Up @@ -1182,7 +1183,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")]
Expand All @@ -1195,7 +1197,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]
Expand Down
Loading