From bc7f2bdc1e8db43301a8cbbc57418468aa0e1c5d Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 15 May 2025 10:07:08 +1000 Subject: [PATCH] client: Remove duplicate macro The `impl_client_v22_gettxout` macro is wrong because it is no different to the v17 one - remove it. --- client/src/client_sync/v22/blockchain.rs | 22 ---------------------- client/src/client_sync/v22/mod.rs | 3 +-- client/src/client_sync/v23/mod.rs | 2 +- client/src/client_sync/v24.rs | 2 +- client/src/client_sync/v25.rs | 2 +- client/src/client_sync/v26/mod.rs | 2 +- client/src/client_sync/v27.rs | 2 +- client/src/client_sync/v28/mod.rs | 2 +- 8 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 client/src/client_sync/v22/blockchain.rs diff --git a/client/src/client_sync/v22/blockchain.rs b/client/src/client_sync/v22/blockchain.rs deleted file mode 100644 index df90c8a3..00000000 --- a/client/src/client_sync/v22/blockchain.rs +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: CC0-1.0 - -//! Macros for implementing JSON-RPC methods on a client. -//! -//! Specifically this is methods found under the `== Blockchain ==` section of the -//! API docs of Bitcoin Core `v22`. -//! -//! All macros require `Client` to be in scope. -//! -//! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`. - -/// Implements Bitcoin Core JSON-RPC API method `gettxout` -#[macro_export] -macro_rules! impl_client_v22__gettxout { - () => { - impl Client { - pub fn get_tx_out(&self, txid: Txid, vout: u64) -> Result { - self.call("gettxout", &[into_json(txid)?, into_json(vout)?]) - } - } - }; -} diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index 0f4dc5bb..2ca033d4 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -4,7 +4,6 @@ //! //! We ignore option arguments unless they effect the shape of the returned JSON data. -mod blockchain; mod wallet; use std::collections::BTreeMap; @@ -41,7 +40,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v17__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index 6f870f73..e039417c 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -42,7 +42,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v17__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v24.rs b/client/src/client_sync/v24.rs index 0d3fcfc3..ab3950e4 100644 --- a/client/src/client_sync/v24.rs +++ b/client/src/client_sync/v24.rs @@ -39,7 +39,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v17__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v25.rs b/client/src/client_sync/v25.rs index 53f31310..1b80af3f 100644 --- a/client/src/client_sync/v25.rs +++ b/client/src/client_sync/v25.rs @@ -39,7 +39,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v17__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index a61a4e31..ad230435 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -43,7 +43,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v26__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v27.rs b/client/src/client_sync/v27.rs index 60ab2612..4ebc4d8c 100644 --- a/client/src/client_sync/v27.rs +++ b/client/src/client_sync/v27.rs @@ -39,7 +39,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v26__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index 19571720..e5d87a32 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -41,7 +41,7 @@ crate::impl_client_v17__getmempooldescendants!(); crate::impl_client_v17__getmempoolentry!(); crate::impl_client_v17__getmempoolinfo!(); crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v22__gettxout!(); +crate::impl_client_v17__gettxout!(); crate::impl_client_v17__gettxoutproof!(); crate::impl_client_v26__gettxoutsetinfo!(); crate::impl_client_v17__preciousblock!();