Skip to content

Unify the into_model style in integration tests #349

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

Merged
merged 2 commits into from
Sep 5, 2025
Merged

Unify the into_model style in integration tests #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb4f30
Unify integration_test into_model() calls
jamillambert Sep 2, 2025
4fcbef1
Unify test version feature gate placement
jamillambert Sep 3, 2025
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
53 changes: 29 additions & 24 deletions integration_test/tests/blockchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#![allow(non_snake_case)] // Test names intentionally use double underscore.

use bitcoin::hex;
use bitcoin::consensus::encode;
use integration_test::{Node, NodeExt as _, Wallet};
use node::client::client_sync;
use node::vtype::*; // All the version specific types.
Expand Down Expand Up @@ -38,8 +40,8 @@ fn blockchain__dump_tx_out_set__modelled() {
fn blockchain__get_best_block_hash__modelled() {
let node = Node::with_wallet(Wallet::None, &[]);

let json = node.client.get_best_block_hash().expect("rpc");
let model: Result<mtype::GetBestBlockHash, _> = json.into_model();
let json: GetBestBlockHash = node.client.get_best_block_hash().expect("getbestblockhash");
let model: Result<mtype::GetBestBlockHash, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

Expand All @@ -49,12 +51,12 @@ fn blockchain__get_block__modelled() {
let block_hash = node.client.best_block_hash().expect("best_block_hash failed");

let json: GetBlockVerboseZero = node.client.get_block_verbose_zero(block_hash).expect("getblock verbose=0");
let model: Result<mtype::GetBlockVerboseZero, _> = json.into_model();
model.expect("GetBlock into model");
let model: Result<mtype::GetBlockVerboseZero, encode::FromHexError> = json.into_model();
model.unwrap();

let json: GetBlockVerboseOne = node.client.get_block_verbose_one(block_hash).expect("getblock verbose=1");
let model: Result<mtype::GetBlockVerboseOne, GetBlockVerboseOneError> = json.into_model();
model.expect("GetBlockVerbose into model");
model.unwrap();

// TODO: Test getblock 2
// let json = node.client.get_block_with_verbosity(block_hash, 2).expect("getblock verbosity 2");
Expand Down Expand Up @@ -126,7 +128,7 @@ fn blockchain__get_block_hash__modelled() {
let node = Node::with_wallet(Wallet::None, &[]);

let json: GetBlockHash = node.client.get_block_hash(0).expect("getblockhash");
let model: Result<mtype::GetBlockHash, _> = json.into_model();
let model: Result<mtype::GetBlockHash, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

Expand Down Expand Up @@ -161,13 +163,15 @@ fn getblockstats() {
let node = Node::with_wallet(Wallet::Default, &[]);
node.fund_wallet();

let json = node.client.get_block_stats_by_height(1).expect("getblockstats");
json.into_model().unwrap();
let json: GetBlockStats = node.client.get_block_stats_by_height(1).expect("getblockstats");
let model: Result<mtype::GetBlockStats, GetBlockStatsError> = json.into_model();
model.unwrap();

// No need for explicit types, used explicitly in test below.
let block_hash = node.client.best_block_hash().expect("best_block_hash failed");
let json = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
json.into_model().unwrap();
let json: GetBlockStats = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
let model: Result<mtype::GetBlockStats, GetBlockStatsError> = json.into_model();
model.unwrap();
}

fn getblockstats_txindex() {
Expand All @@ -177,12 +181,13 @@ fn getblockstats_txindex() {
// Get block stats by height.
let json: GetBlockStats = node.client.get_block_stats_by_height(101).expect("getblockstats");
let model: Result<mtype::GetBlockStats, GetBlockStatsError> = json.into_model();
model.expect("GetBlockStats into model");
model.unwrap();

// Get block stats by block hash.
let block_hash = node.client.best_block_hash().expect("best_block_hash failed");
let json = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
json.into_model().unwrap();
let json: GetBlockStats = node.client.get_block_stats_by_block_hash(&block_hash).expect("getblockstats");
let model: Result<mtype::GetBlockStats, GetBlockStatsError> = json.into_model();
model.unwrap();
}

#[test]
Expand All @@ -193,7 +198,7 @@ fn blockchain__get_chain_states__modelled() {
let (_address, _tx) = node.create_mined_transaction();

let json: GetChainStates = node.client.get_chain_states().expect("getchainstates");
let model: Result<mtype::GetChainStates, _> = json.into_model();
let model: Result<mtype::GetChainStates, GetChainStatesError> = json.into_model();
let chain_states = model.unwrap();

assert!(chain_states.chain_states[0].blocks > 0);
Expand Down Expand Up @@ -255,7 +260,7 @@ fn blockchain__get_mempool_ancestors__modelled() {

let json: GetMempoolAncestors =
node.client.get_mempool_ancestors(child_txid).expect("getmempoolancestors");
let model: Result<mtype::GetMempoolAncestors, _> = json.into_model();
let model: Result<mtype::GetMempoolAncestors, hex::HexToArrayError> = json.into_model();
let ancestors = model.unwrap();

assert!(ancestors.0.contains(&parent_txid));
Expand All @@ -272,7 +277,7 @@ fn blockchain__get_mempool_ancestors_verbose__modelled() {
.client
.get_mempool_ancestors_verbose(child_txid)
.expect("getmempoolancestors verbose");
let model: Result<mtype::GetMempoolAncestorsVerbose, _> = json.into_model();
let model: Result<mtype::GetMempoolAncestorsVerbose, MapMempoolEntryError> = json.into_model();
let ancestors = model.unwrap();

assert!(ancestors.0.contains_key(&parent_txid));
Expand All @@ -287,7 +292,7 @@ fn blockchain__get_mempool_descendants__modelled() {

let json: GetMempoolDescendants =
node.client.get_mempool_descendants(parent_txid).expect("getmempooldescendants");
let model: Result<mtype::GetMempoolDescendants, _> = json.into_model();
let model: Result<mtype::GetMempoolDescendants, hex::HexToArrayError> = json.into_model();
let descendants = model.unwrap();

assert!(descendants.0.contains(&child_txid));
Expand All @@ -304,7 +309,7 @@ fn blockchain__get_mempool_descendants_verbose__modelled() {
.client
.get_mempool_descendants_verbose(parent_txid)
.expect("getmempooldescendants verbose");
let model: Result<mtype::GetMempoolDescendantsVerbose, _> = json.into_model();
let model: Result<mtype::GetMempoolDescendantsVerbose, MapMempoolEntryError> = json.into_model();
let descendants = model.unwrap();

assert!(descendants.0.contains_key(&child_txid));
Expand Down Expand Up @@ -343,7 +348,7 @@ fn blockchain__get_raw_mempool__modelled() {

// verbose = false
let json: GetRawMempool = node.client.get_raw_mempool().expect("getrawmempool");
let model: Result<mtype::GetRawMempool, _> = json.clone().into_model();
let model: Result<mtype::GetRawMempool, hex::HexToArrayError> = json.clone().into_model();
let mempool = model.unwrap();
// Sanity check.
assert_eq!(mempool.0.len(), 1);
Expand Down Expand Up @@ -474,8 +479,8 @@ fn blockchain__savemempool() {
}
}

#[cfg(not(feature = "v24_and_below"))]
#[test]
#[cfg(not(feature = "v24_and_below"))]
fn blockchain__scan_blocks_modelled() {
let node = Node::with_wallet(Wallet::None, &["-blockfilterindex=1"]);

Expand Down Expand Up @@ -519,7 +524,7 @@ fn verify_tx_out_proof(node: &Node) -> Result<(), client_sync::Error> {
let proof = node.client.get_tx_out_proof(&[txid])?;

let json: VerifyTxOutProof = node.client.verify_tx_out_proof(&proof)?;
let model: Result<mtype::VerifyTxOutProof, _> = json.into_model();
let model: Result<mtype::VerifyTxOutProof, hex::HexToArrayError> = json.into_model();
let txids = model.unwrap();

// sanity check
Expand Down Expand Up @@ -547,9 +552,9 @@ fn create_child_spending_parent(node: &Node, parent_txid: bitcoin::Txid) -> bitc
.client
.sign_raw_transaction_with_wallet(&funded_tx)
.expect("signrawtransactionwithwallet");
let model = signed.into_model().expect("SignRawTransactionWithWallet into model");
let child_txid = model.tx.compute_txid();
let _ = node.client.send_raw_transaction(&model.tx).expect("sendrawtransaction");
let sign_raw_transaction = signed.into_model().expect("SignRawTransactionWithWallet into model");
let child_txid = sign_raw_transaction.tx.compute_txid();
let _ = node.client.send_raw_transaction(&sign_raw_transaction.tx).expect("sendrawtransaction");

child_txid
}
2 changes: 1 addition & 1 deletion integration_test/tests/control.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ fn control__get_memory_info() {
let _: GetMemoryInfoStats = node.client.get_memory_info().unwrap();
}

#[cfg(not(feature = "v17"))]
#[test]
#[cfg(not(feature = "v17"))]
fn control__get_rpc_info() {
let node = Node::with_wallet(Wallet::None, &[]);
let _ = node.client.get_rpc_info().unwrap();
Expand Down
27 changes: 15 additions & 12 deletions integration_test/tests/generating.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@

#![allow(non_snake_case)] // Test names intentionally use double underscore.

use bitcoin::hex;
use integration_test::{Node, NodeExt as _, Wallet};
use node::vtype::*; // All the version specific types.
use node::mtype;

#[cfg(not(feature = "v20_and_below"))]
#[test]
#[cfg(not(feature = "v20_and_below"))]
fn generating__generate_block__modelled() {
let node = Node::with_wallet(Wallet::Default, &[]);
node.fund_wallet();
Expand All @@ -29,7 +30,7 @@ fn generating__generate_block__modelled() {
{
// No `submit` argument
json = node.client.generate_block(&mining_addr.to_string(), &transactions).expect("generateblock");
let model: Result<mtype::GenerateBlock, _> = json.into_model();
let model: Result<mtype::GenerateBlock, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

Expand All @@ -43,15 +44,14 @@ fn generating__generate_block__modelled() {
}

#[test]
// The `generate` method was deprecated in Core v0.18 and was removed in v0.19.
#[cfg(feature = "v17")]
fn generating__generate__modelled() {
const NBLOCKS: usize = 10;
let node = Node::with_wallet(Wallet::Default, &[]);

let json: Generate = node.client.generate(NBLOCKS).expect("generate");

let model: Result<mtype::Generate, _> = json.into_model();
let model: Result<mtype::Generate, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

Expand All @@ -64,12 +64,12 @@ fn generating__generate_to_address__modelled() {

let json: GenerateToAddress = node.client.generate_to_address(NBLOCKS, &address).expect("generatetoaddress");

let model: Result<mtype::GenerateToAddress, _> = json.into_model();
let _ = model.unwrap();
let model: Result<mtype::GenerateToAddress, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

#[cfg(not(feature = "v19_and_below"))]
#[test]
#[cfg(not(feature = "v19_and_below"))]
fn generating__generate_to_descriptor__modelled() {
const NBLOCKS: usize = 1;

Expand All @@ -78,8 +78,8 @@ fn generating__generate_to_descriptor__modelled() {
let descriptor = format!("addr({})", address);

let json: GenerateToDescriptor = node.client.generate_to_descriptor(NBLOCKS, &descriptor).expect("generatetodescriptor");
let model: Result<mtype::GenerateToDescriptor, _> = json.into_model();
let _ = model.unwrap();
let model: Result<mtype::GenerateToDescriptor, hex::HexToArrayError> = json.into_model();
model.unwrap();
}

// This method does not appear in the output of `bitcoin-cli help`.
Expand All @@ -103,7 +103,10 @@ fn generating__invalidate_block() {
assert_ne!(old_best_block, new_best_block);

node.client.invalidate_block(new_best_block).expect("invalidateblock");
let best_block =
node.client.get_best_block_hash().expect("getbestblockhash").into_model().unwrap().0;
assert_eq!(old_best_block, best_block);

let json: GetBestBlockHash = node.client.get_best_block_hash().expect("getbestblockhash");
let model: Result<mtype::GetBestBlockHash, hex::HexToArrayError> = json.into_model();
let best_block = model.unwrap();

assert_eq!(old_best_block, best_block.0);
}
14 changes: 7 additions & 7 deletions integration_test/tests/mining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ fn mining__get_block_template__modelled() {

let json: GetBlockTemplate = node1.client.get_block_template(&options)
.expect("get_block_template RPC failed");
let _: Result<mtype::GetBlockTemplate, GetBlockTemplateError> = json.into_model();
let model: Result<mtype::GetBlockTemplate, GetBlockTemplateError> = json.into_model();
model.unwrap();
}

#[test]
Expand Down Expand Up @@ -61,7 +62,6 @@ fn mining__get_network_hash_ps() {
}

#[test]
// Core version 26 onwards.
#[cfg(not(feature = "v25_and_below"))]
fn mining__get_prioritised_transactions() {
let node = Node::with_wallet(Wallet::Default, &[]);
Expand All @@ -77,8 +77,8 @@ fn mining__prioritise_transaction() {

let (_addr, txid) = node.create_mempool_transaction();
let fee_delta = SignedAmount::from_sat(10_000);
let res = node.client.prioritise_transaction(&txid, fee_delta).expect("prioritisetransaction");
assert!(res) // According to docs always returns true.
let json = node.client.prioritise_transaction(&txid, fee_delta).expect("prioritisetransaction");
assert!(json) // According to docs always returns true.
}

#[test]
Expand All @@ -93,8 +93,8 @@ fn mining__submit_block() {
node3.mine_a_block();

let options = TemplateRequest { rules: vec![TemplateRules::Segwit] };
let json = node1.client.get_block_template(&options).expect("getblocktemplate");
let template = json.into_model().expect("GetBlockTemplate into model");
let json: GetBlockTemplate = node1.client.get_block_template(&options).expect("getblocktemplate");
let template: mtype::GetBlockTemplate = json.into_model().unwrap();

submit_empty_block(&node1, &template);
// submit_block_with_dummy_coinbase(&node1, &template);
Expand Down Expand Up @@ -211,8 +211,8 @@ fn mining__submit_block_with_dummy_coinbase(node: &Node, bt: &mtype::GetBlockTem
let _: () = node.client.submit_block(&block).expect("submitblock");
}

#[cfg(not(feature = "v17"))]
#[test]
#[cfg(not(feature = "v17"))]
fn mining__submit_header() {
let node = Node::with_wallet(Wallet::Default, &[]);
node.fund_wallet();
Expand Down
Loading