Skip to content

Fix all the issues with verify --tests #634

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
tcharding merged 9 commits into from
Jun 18, 2026
Merged

Fix all the issues with verify --tests #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7eded89
Add missing double _ to test names
jamillambert Jun 16, 2026
6ee0871
Remove untested label from tested RPC
jamillambert Jun 16, 2026
258f74d
Add missing __modelled to test names
jamillambert Jun 17, 2026
6492a96
Add missing underscore to test names
jamillambert Jun 16, 2026
1d63e77
Expand getzmqnotifications test to cover v17
jamillambert Jun 17, 2026
caf8612
Correct names in verify method files
jamillambert Jun 17, 2026
7a453c3
Mark deprecated RPCs as UNTESTED in types
jamillambert Jun 17, 2026
932836c
Mark untested RPCs in types table as UNTESTED
jamillambert Jun 17, 2026
d64ada2
Replace key_pool with keypool
jamillambert Jun 17, 2026
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 client/src/client_sync/v17/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v17__list_labels!();
crate::impl_client_v17__list_lock_unspent!();
Expand Down
4 changes: 2 additions & 2 deletions client/src/client_sync/v17/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,10 @@ macro_rules! impl_client_v17__import_wallet {

/// Implements Bitcoin Core JSON-RPC API method `keypoolrefill`.
#[macro_export]
macro_rules! impl_client_v17__key_pool_refill {
macro_rules! impl_client_v17__keypool_refill {
() => {
impl Client {
pub fn key_pool_refill(&self) -> Result<()> {
pub fn keypool_refill(&self) -> Result<()> {
match self.call("keypoolrefill", &[]) {
Ok(serde_json::Value::Null) => Ok(()),
Ok(res) => Err(Error::Returned(res.to_string())),
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v18/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v17__list_labels!();
crate::impl_client_v17__list_lock_unspent!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v19/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v18__list_received_by_label!();
crate::impl_client_v17__list_labels!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v20/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v17__list_labels!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v21/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v17__list_labels!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v22/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v23/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v24/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v25/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v26/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v17__list_labels!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v27/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v28/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v29/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ crate::impl_client_v17__import_privkey!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__import_pubkey!();
crate::impl_client_v17__import_wallet!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v30/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ crate::impl_client_v17__get_transaction!();
crate::impl_client_v17__get_wallet_info!();
crate::impl_client_v21__import_descriptors!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
2 changes: 1 addition & 1 deletion client/src/client_sync/v31/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ crate::impl_client_v17__get_transaction!();
crate::impl_client_v17__get_wallet_info!();
crate::impl_client_v21__import_descriptors!();
crate::impl_client_v17__import_pruned_funds!();
crate::impl_client_v17__key_pool_refill!();
crate::impl_client_v17__keypool_refill!();
crate::impl_client_v17__list_address_groupings!();
crate::impl_client_v22__list_descriptors!();
crate::impl_client_v18__list_received_by_label!();
Expand Down
6 changes: 3 additions & 3 deletions integration_test/tests/blockchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ fn blockchain__prune_blockchain() {
}

#[test]
fn blockchain__savemempool() {
fn blockchain__save_mempool() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);
node.fund_wallet();
let (_addr, _txid) = node.create_mempool_transaction();
Expand All @@ -783,7 +783,7 @@ fn blockchain__savemempool() {

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

// Arbitrary scan descriptor
Expand All @@ -807,7 +807,7 @@ fn blockchain__scan_blocks_modelled() {
}

#[test]
fn blockchain__scan_tx_out_set_modelled() {
fn blockchain__scan_tx_out_set__modelled() {
let node = match () {
#[cfg(feature = "v21_and_below")]
() => BitcoinD::with_wallet(Wallet::None, &[]),
Expand Down
4 changes: 2 additions & 2 deletions integration_test/tests/mining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ fn mining__get_block_template__modelled() {
}

#[test]
fn mining__get_mining_info() {
fn mining__get_mining_info__modelled() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);
node.fund_wallet();

Expand Down Expand Up @@ -65,7 +65,7 @@ fn mining__get_network_hash_ps() {

#[test]
#[cfg(not(feature = "v25_and_below"))]
fn mining__get_prioritised_transactions() {
fn mining__get_prioritised_transactions__modelled() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);
node.fund_wallet();
let (_address, txid) = node.create_mempool_transaction();
Expand Down
8 changes: 4 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 @@ -298,7 +298,7 @@ fn wallet__get_balance__modelled() {

#[test]
#[cfg(not(feature = "v18_and_below"))]
fn wallet__get_balances() {
fn wallet__get_balances__modelled() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);
node.fund_wallet();

Expand Down Expand Up @@ -548,7 +548,7 @@ fn wallet__import_wallet() {
fn wallet__keypool_refill() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);

let _: () = node.client.key_pool_refill().expect("keypoolrefill");
let _: () = node.client.keypool_refill().expect("keypoolrefill");
}

#[test]
Expand Down Expand Up @@ -719,7 +719,7 @@ fn wallet__import_multi() {

#[test]
#[cfg(feature = "v29_and_below")]
fn wallet__import_privkey() {
fn wallet__import_priv_key() {
let node = match () {
#[cfg(feature = "v22_and_below")]
() => BitcoinD::with_wallet(Wallet::Default, &[]),
Expand Down Expand Up @@ -1072,7 +1072,7 @@ fn wallet__sign_message__modelled() {

#[test]
#[cfg(not(feature = "v23_and_below"))]
fn wallet__simulate_raw_transaction() {
fn wallet__simulate_raw_transaction__modelled() {
let node = BitcoinD::with_wallet(Wallet::Default, &[]);
node.fund_wallet();

Expand Down
17 changes: 12 additions & 5 deletions integration_test/tests/zmq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@ use bitcoind::vtype::*;
use integration_test::{BitcoinD, BitcoinDExt as _, Wallet}; // All the version specific types.

#[test]
#[cfg(not(feature = "v17"))]
fn zmq__get_zmq_notifications__modelled() {
// Start node with a ZMQ notification enabled so we have at least one entry.
// Using hashblock as it is lightweight.
let node = BitcoinD::with_wallet(Wallet::Default, &["-zmqpubhashblock=tcp://127.0.0.1:29000"]);

let list: Vec<GetZmqNotifications> =
// v17 always returns an empty list regardless of ZMQ args.
#[cfg(feature = "v17")]
let _: Vec<GetZmqNotifications> =
node.client.get_zmq_notifications().expect("getzmqnotifications");
let zmq_notification = &list[0];
assert_eq!(zmq_notification.type_, "pubhashblock");
assert_eq!(zmq_notification.address, "tcp://127.0.0.1:29000");

#[cfg(not(feature = "v17"))]
{
let list: Vec<GetZmqNotifications> =
node.client.get_zmq_notifications().expect("getzmqnotifications");
let zmq_notification = &list[0];
assert_eq!(zmq_notification.type_, "pubhashblock");
assert_eq!(zmq_notification.address, "tcp://127.0.0.1:29000");
}
}
20 changes: 10 additions & 10 deletions types/src/v17/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
//! | getmininginfo | version + model | |
//! | getnetworkhashps | returns numeric | |
//! | prioritisetransaction | returns boolean | |
//! | submitblock | returns nothing | |
//! | submitblock | returns nothing | UNTESTED |
//!
//! </details>
//!
Expand Down Expand Up @@ -159,15 +159,15 @@
//! | dumpprivkey | version + model | |
//! | dumpwallet | version | |
//! | encryptwallet | version | |
//! | getaccount | returns nothing | |
//! | getaccountaddress | returns nothing | |
//! | getaddressbyaccount | returns nothing | |
//! | getaccount | returns nothing | UNTESTED (deprecated) |
//! | getaccountaddress | returns nothing | UNTESTED (deprecated) |
//! | getaddressbyaccount | returns nothing | UNTESTED (deprecated) |
//! | getaddressesbylabel | version + model | |
//! | getaddressinfo | version + model | |
//! | getbalance | version + model | |
//! | getnewaddress | version + model | |
//! | getrawchangeaddress | version + model | |
//! | getreceivedbyaccount | returns nothing | |
//! | getreceivedbyaccount | returns nothing | UNTESTED (deprecated) |
//! | getreceivedbyaddress | version + model | |
//! | gettransaction | version + model | |
//! | getunconfirmedbalance | version + model | |
Expand All @@ -179,25 +179,25 @@
//! | importpubkey | returns nothing | |
//! | importwallet | returns nothing | |
//! | keypoolrefill | returns nothing | |
//! | listaccounts | returns nothing | |
//! | listaccounts | returns nothing | UNTESTED (deprecated) |
//! | listaddressgroupings | version + model | |
//! | listlabels | version | |
//! | listlockunspent | version + model | |
//! | listreceivedbyaccount | returns nothing | |
//! | listreceivedbyaccount | returns nothing | UNTESTED (deprecated) |
//! | listreceivedbyaddress | version + model | |
//! | listsinceblock | version + model | |
//! | listtransactions | version + model | |
//! | listunspent | version + model | |
//! | listwallets | version + model | |
//! | loadwallet | version + model | |
//! | lockunspent | version | |
//! | move | returns boolean | |
//! | move | returns boolean | UNTESTED (deprecated) |
//! | removeprunedfunds | returns nothing | |
//! | rescanblockchain | version + model | |
//! | sendfrom | returns nothing | |
//! | sendfrom | returns nothing | UNTESTED (deprecated) |
//! | sendmany | version + model | |
//! | sendtoaddress | version + model | |
//! | setaccount | returns nothing | |
//! | setaccount | returns nothing | UNTESTED (deprecated) |
//! | sethdseed | returns nothing | |
//! | settxfee | version | |
//! | signmessage | version + model | |
Expand Down
4 changes: 2 additions & 2 deletions types/src/v18/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
//! | getmininginfo | version + model | |
//! | getnetworkhashps | returns numeric | |
//! | prioritisetransaction | returns boolean | |
//! | submitblock | returns nothing | |
//! | submitblock | returns nothing | UNTESTED |
//! | submitheader | returns nothing | |
//!
//! </details>
Expand Down Expand Up @@ -200,7 +200,7 @@
//! | sendmany | version + model | |
//! | sendtoaddress | version + model | |
//! | sethdseed | returns nothing | |
//! | setlabel | returns nothing | |
//! | setlabel | returns nothing | UNTESTED |
//! | settxfee | version | |
//! | signmessage | version + model | |
//! | signrawtransactionwithwallet | version + model | |
Expand Down
4 changes: 2 additions & 2 deletions types/src/v19/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
//! | getmininginfo | version + model | |
//! | getnetworkhashps | returns numeric | |
//! | prioritisetransaction | returns boolean | |
//! | submitblock | returns nothing | |
//! | submitblock | returns nothing | UNTESTED |
//! | submitheader | returns nothing | |
//!
//! </details>
Expand Down Expand Up @@ -201,7 +201,7 @@
//! | sendmany | version + model | |
//! | sendtoaddress | version + model | |
//! | sethdseed | returns nothing | |
//! | setlabel | returns nothing | |
//! | setlabel | returns nothing | UNTESTED |
//! | settxfee | version | |
//! | setwalletflag | version | |
//! | signmessage | version + model | |
Expand Down
Loading
Loading