diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index 3d81c9fba..1fdef3126 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index c1db0027b..22716c759 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -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())), diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index 01bf5cad2..48b797b17 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 7a4ed7c1d..8f8914db5 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs index 1b00a02a7..c506ccc03 100644 --- a/client/src/client_sync/v20/mod.rs +++ b/client/src/client_sync/v20/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index e319c8e6e..17c7c9cc0 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 57cf8816c..a7f801776 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index c5043b18b..7f23614ad 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs index e77df3ed4..f8fa9a686 100644 --- a/client/src/client_sync/v24/mod.rs +++ b/client/src/client_sync/v24/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs index 9364e7ac8..2e65c2c1a 100644 --- a/client/src/client_sync/v25/mod.rs +++ b/client/src/client_sync/v25/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index fe98e326c..df99a4d7b 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs index 3757c551f..4323bb89b 100644 --- a/client/src/client_sync/v27/mod.rs +++ b/client/src/client_sync/v27/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index 8d41c81ca..78ab82eb6 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 7aa2bbb6e..6593451e1 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v30/mod.rs b/client/src/client_sync/v30/mod.rs index 4830a6a4e..035b06e35 100644 --- a/client/src/client_sync/v30/mod.rs +++ b/client/src/client_sync/v30/mod.rs @@ -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!(); diff --git a/client/src/client_sync/v31/mod.rs b/client/src/client_sync/v31/mod.rs index bf1ef11c1..3501f922e 100644 --- a/client/src/client_sync/v31/mod.rs +++ b/client/src/client_sync/v31/mod.rs @@ -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!(); diff --git a/integration_test/tests/blockchain.rs b/integration_test/tests/blockchain.rs index c8dbec7e6..153931402 100644 --- a/integration_test/tests/blockchain.rs +++ b/integration_test/tests/blockchain.rs @@ -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(); @@ -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 @@ -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, &[]), diff --git a/integration_test/tests/mining.rs b/integration_test/tests/mining.rs index 534ce7483..da16cdc4e 100644 --- a/integration_test/tests/mining.rs +++ b/integration_test/tests/mining.rs @@ -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(); @@ -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(); diff --git a/integration_test/tests/wallet.rs b/integration_test/tests/wallet.rs index d6839fe52..386dcb954 100644 --- a/integration_test/tests/wallet.rs +++ b/integration_test/tests/wallet.rs @@ -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(); @@ -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] @@ -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, &[]), @@ -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(); diff --git a/integration_test/tests/zmq.rs b/integration_test/tests/zmq.rs index 372bd5f44..b7511589f 100644 --- a/integration_test/tests/zmq.rs +++ b/integration_test/tests/zmq.rs @@ -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 = + // v17 always returns an empty list regardless of ZMQ args. + #[cfg(feature = "v17")] + let _: Vec = 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 = + 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"); + } } diff --git a/types/src/v17/mod.rs b/types/src/v17/mod.rs index c2c546de3..88ec01ae0 100644 --- a/types/src/v17/mod.rs +++ b/types/src/v17/mod.rs @@ -85,7 +85,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! //! //! @@ -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 | | @@ -179,11 +179,11 @@ //! | 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 | | @@ -191,13 +191,13 @@ //! | 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 | | diff --git a/types/src/v18/mod.rs b/types/src/v18/mod.rs index 135df268b..1361ef682 100644 --- a/types/src/v18/mod.rs +++ b/types/src/v18/mod.rs @@ -86,7 +86,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -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 | | diff --git a/types/src/v19/mod.rs b/types/src/v19/mod.rs index 59a116a2f..1b4d9bba8 100644 --- a/types/src/v19/mod.rs +++ b/types/src/v19/mod.rs @@ -86,7 +86,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -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 | | diff --git a/types/src/v20/mod.rs b/types/src/v20/mod.rs index c97ead88b..d8d49cdaf 100644 --- a/types/src/v20/mod.rs +++ b/types/src/v20/mod.rs @@ -87,7 +87,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -202,7 +202,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v21/mod.rs b/types/src/v21/mod.rs index 254204193..c0e36387d 100644 --- a/types/src/v21/mod.rs +++ b/types/src/v21/mod.rs @@ -88,7 +88,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -207,7 +207,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v22/mod.rs b/types/src/v22/mod.rs index 59588e742..7357f0d63 100644 --- a/types/src/v22/mod.rs +++ b/types/src/v22/mod.rs @@ -88,7 +88,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -217,7 +217,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v23/mod.rs b/types/src/v23/mod.rs index b7625da92..bbd799e55 100644 --- a/types/src/v23/mod.rs +++ b/types/src/v23/mod.rs @@ -79,7 +79,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -124,7 +124,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | //! @@ -210,7 +210,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v24/mod.rs b/types/src/v24/mod.rs index aa17f9856..02393b90b 100644 --- a/types/src/v24/mod.rs +++ b/types/src/v24/mod.rs @@ -80,7 +80,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -125,7 +125,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | //! @@ -213,7 +213,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v25/mod.rs b/types/src/v25/mod.rs index c1a789c65..bbf0108c2 100644 --- a/types/src/v25/mod.rs +++ b/types/src/v25/mod.rs @@ -81,7 +81,7 @@ //! | getmininginfo | version + model | | //! | getnetworkhashps | returns numeric | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -126,7 +126,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | //! @@ -214,7 +214,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v26/mod.rs b/types/src/v26/mod.rs index 8bd9b8041..3d0fa44fc 100644 --- a/types/src/v26/mod.rs +++ b/types/src/v26/mod.rs @@ -51,7 +51,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -86,7 +86,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -125,7 +125,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | | -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -133,7 +133,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -222,7 +222,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v27/mod.rs b/types/src/v27/mod.rs index 03b8a21dd..aed1103fd 100644 --- a/types/src/v27/mod.rs +++ b/types/src/v27/mod.rs @@ -51,7 +51,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -86,7 +86,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -125,7 +125,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | | -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -133,7 +133,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -222,7 +222,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v28/mod.rs b/types/src/v28/mod.rs index 75c287306..3a6659735 100644 --- a/types/src/v28/mod.rs +++ b/types/src/v28/mod.rs @@ -51,7 +51,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -86,7 +86,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -125,7 +125,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | | -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -133,7 +133,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -224,7 +224,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v29/mod.rs b/types/src/v29/mod.rs index a7e33c200..be1c755d4 100644 --- a/types/src/v29/mod.rs +++ b/types/src/v29/mod.rs @@ -52,7 +52,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -87,7 +87,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -126,7 +126,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | | -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -134,7 +134,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -225,7 +225,7 @@ //! | sendmany | version + model | | //! | sendtoaddress | version + model | | //! | sethdseed | returns nothing | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v30/mod.rs b/types/src/v30/mod.rs index 7844dd23b..75f6c3db2 100644 --- a/types/src/v30/mod.rs +++ b/types/src/v30/mod.rs @@ -52,7 +52,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -90,7 +90,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -129,7 +129,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | Musig not modelled: not in rust-bitcoin| -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -137,7 +137,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -199,7 +199,7 @@ //! | listdescriptors | version | | //! | listlabels | version | | //! | listlockunspent | version + model | | -//! | migratewallet | version | Untested in v30, unchanged from v29 | +//! | migratewallet | version | UNTESTED unchanged from v29 | //! | psbtbumpfee | version + model | | //! | listreceivedbyaddress | version + model | | //! | listreceivedbylabel | version + model | | @@ -217,7 +217,7 @@ //! | sendall | version + model | | //! | sendmany | version + model | | //! | sendtoaddress | version + model | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | settxfee | version | | //! | setwalletflag | version | | //! | signmessage | version + model | | diff --git a/types/src/v31/mod.rs b/types/src/v31/mod.rs index b6f12f8f1..a22bba311 100644 --- a/types/src/v31/mod.rs +++ b/types/src/v31/mod.rs @@ -53,7 +53,7 @@ //! | gettxoutsetinfo | version + model | | //! | gettxspendingprevout | version + model | | //! | importmempool | returns nothing | | -//! | loadtxoutset | version + model | UNTESTED | +//! | loadtxoutset | version + model | | //! | preciousblock | returns nothing | | //! | pruneblockchain | version | | //! | savemempool | version | | @@ -91,7 +91,7 @@ //! | getnetworkhashps | returns numeric | | //! | getprioritisedtransactions | version + model | | //! | prioritisetransaction | returns boolean | | -//! | submitblock | returns nothing | | +//! | submitblock | returns nothing | UNTESTED | //! | submitheader | returns nothing | | //! //! @@ -131,7 +131,7 @@ //! | createpsbt | version + model | | //! | createrawtransaction | version + model | | //! | decodepsbt | version + model | Musig not modelled: not in rust-bitcoin| -//! | descriptorprocesspsbt | version + model | | +//! | descriptorprocesspsbt | version + model | UNTESTED | //! | decoderawtransaction | version + model | | //! | decodescript | version + model | | //! | finalizepsbt | version + model | | @@ -140,7 +140,7 @@ //! | getrawtransaction | version + model | Includes additional 'verbose' type | //! | joinpsbts | version + model | | //! | sendrawtransaction | version + model | | -//! | signrawtransactionwithkey | version + model | | +//! | signrawtransactionwithkey | version + model | UNTESTED | //! | submitpackage | version + model | | //! | testmempoolaccept | version + model | | //! | utxoupdatepsbt | version + model | | @@ -202,7 +202,7 @@ //! | listdescriptors | version | | //! | listlabels | version | | //! | listlockunspent | version + model | | -//! | migratewallet | version | Untested in v30, unchanged from v29 | +//! | migratewallet | version | UNTESTED unchanged from v29 | //! | psbtbumpfee | version + model | | //! | listreceivedbyaddress | version + model | | //! | listreceivedbylabel | version + model | | @@ -220,7 +220,7 @@ //! | sendall | version + model | | //! | sendmany | version + model | | //! | sendtoaddress | version + model | | -//! | setlabel | returns nothing | | +//! | setlabel | returns nothing | UNTESTED | //! | setwalletflag | version | | //! | signmessage | version + model | | //! | signrawtransactionwithwallet | version + model | | diff --git a/verify/src/method/v17.rs b/verify/src/method/v17.rs index 7cc8add33..c768e7ed9 100644 --- a/verify/src/method/v17.rs +++ b/verify/src/method/v17.rs @@ -124,12 +124,12 @@ pub const METHODS: &[Method] = &[ "get_unconfirmed_balance", ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), - Method::new_no_type("importaddress", "import_addressss"), + Method::new_no_type("importaddress", "import_address"), Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_no_type("listaccounts", "list_accounts"), // Deprecated Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), diff --git a/verify/src/method/v18.rs b/verify/src/method/v18.rs index f1aa9f58f..990102440 100644 --- a/verify/src/method/v18.rs +++ b/verify/src/method/v18.rs @@ -48,7 +48,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -128,12 +128,12 @@ pub const METHODS: &[Method] = &[ "get_unconfirmed_balance", ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), - Method::new_no_type("importaddress", "import_addressss"), + Method::new_no_type("importaddress", "import_address"), Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), diff --git a/verify/src/method/v19.rs b/verify/src/method/v19.rs index 0e7869d68..4ab08ee58 100644 --- a/verify/src/method/v19.rs +++ b/verify/src/method/v19.rs @@ -48,7 +48,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -129,12 +129,12 @@ pub const METHODS: &[Method] = &[ "get_unconfirmed_balance", ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), - Method::new_no_type("importaddress", "import_addressss"), + Method::new_no_type("importaddress", "import_address"), Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), diff --git a/verify/src/method/v20.rs b/verify/src/method/v20.rs index b6c56cc59..c61724d50 100644 --- a/verify/src/method/v20.rs +++ b/verify/src/method/v20.rs @@ -49,7 +49,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -130,12 +130,12 @@ pub const METHODS: &[Method] = &[ "get_unconfirmed_balance", ), Method::new_modelled("getwalletinfo", "GetWalletInfo", "get_wallet_info"), - Method::new_no_type("importaddress", "import_addressss"), + Method::new_no_type("importaddress", "import_address"), Method::new_no_model("importmulti", "ImportMulti", "import_multi"), Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), diff --git a/verify/src/method/v21.rs b/verify/src/method/v21.rs index 79f68bbc9..29082f2e3 100644 --- a/verify/src/method/v21.rs +++ b/verify/src/method/v21.rs @@ -50,7 +50,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -138,7 +138,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), diff --git a/verify/src/method/v22.rs b/verify/src/method/v22.rs index bc60371b5..98f786096 100644 --- a/verify/src/method/v22.rs +++ b/verify/src/method/v22.rs @@ -50,7 +50,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -140,7 +140,7 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), diff --git a/verify/src/method/v23.rs b/verify/src/method/v23.rs index 1ca87f010..64f5c3016 100644 --- a/verify/src/method/v23.rs +++ b/verify/src/method/v23.rs @@ -48,7 +48,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -137,13 +137,13 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v24.rs b/verify/src/method/v24.rs index 24fe198c2..43ba65512 100644 --- a/verify/src/method/v24.rs +++ b/verify/src/method/v24.rs @@ -49,7 +49,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -138,14 +138,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v25.rs b/verify/src/method/v25.rs index 85add8b46..7e6fe8fed 100644 --- a/verify/src/method/v25.rs +++ b/verify/src/method/v25.rs @@ -50,7 +50,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_no_type("prioritisetransaction", "prioritise_transaction"), Method::new_no_type("submitblock", "submit_block"), Method::new_no_type("submitheader", "submit_header"), @@ -139,14 +139,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v26.rs b/verify/src/method/v26.rs index 998b7f7f2..a3676a673 100644 --- a/verify/src/method/v26.rs +++ b/verify/src/method/v26.rs @@ -54,7 +54,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions", @@ -155,14 +155,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v27.rs b/verify/src/method/v27.rs index e9776f347..5005e21e8 100644 --- a/verify/src/method/v27.rs +++ b/verify/src/method/v27.rs @@ -54,7 +54,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions", @@ -155,14 +155,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v28.rs b/verify/src/method/v28.rs index 2df5f534b..ebe01ae57 100644 --- a/verify/src/method/v28.rs +++ b/verify/src/method/v28.rs @@ -54,7 +54,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions", @@ -161,14 +161,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v29.rs b/verify/src/method/v29.rs index fd69d5cea..86fc78dda 100644 --- a/verify/src/method/v29.rs +++ b/verify/src/method/v29.rs @@ -59,7 +59,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions", @@ -166,14 +166,14 @@ pub const METHODS: &[Method] = &[ Method::new_no_type("importprivkey", "import_priv_key"), Method::new_no_type("importprunedfunds", "import_pruned_funds"), Method::new_no_type("importpubkey", "import_pubkey"), - Method::new_no_type("importwallet", "import_walet"), + Method::new_no_type("importwallet", "import_wallet"), Method::new_no_type("keypoolrefill", "keypool_refill"), Method::new_modelled("listaddressgroupings", "ListAddressGroupings", "list_address_groupings"), Method::new_no_model("listdescriptors", "ListDescriptors", "list_descriptors"), Method::new_no_model("listlabels", "ListLabels", "list_labels"), Method::new_modelled("listlockunspent", "ListLockUnspent", "list_lock_unspent"), Method::new_no_model("migratewallet", "MigrateWallet", "migrate_wallet"), - Method::new_no_type("newkeypool", "new_key_pool"), + Method::new_no_type("newkeypool", "new_keypool"), Method::new_modelled("psbtbumpfee", "PsbtBumpFee", "psbt_bump_fee"), Method::new_modelled( "listreceivedbyaddress", diff --git a/verify/src/method/v30.rs b/verify/src/method/v30.rs index b20230723..dc124f4c7 100644 --- a/verify/src/method/v30.rs +++ b/verify/src/method/v30.rs @@ -62,7 +62,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions", diff --git a/verify/src/method/v31.rs b/verify/src/method/v31.rs index 2472f68ef..73604bf53 100644 --- a/verify/src/method/v31.rs +++ b/verify/src/method/v31.rs @@ -63,7 +63,7 @@ pub const METHODS: &[Method] = &[ // mining Method::new_modelled("getblocktemplate", "GetBlockTemplate", "get_block_template"), Method::new_modelled("getmininginfo", "GetMiningInfo", "get_mining_info"), - Method::new_no_type("getnetworkhashps", "get_network_hashes_per_second"), + Method::new_no_type("getnetworkhashps", "get_network_hash_ps"), Method::new_modelled( "getprioritisedtransactions", "GetPrioritisedTransactions",