Skip to content

Commit 1b1e2d9

Browse files
committed
client: Remove duplicate macros
The client method macros do not need to be duplicated in different versions because our imports correctly work with the produced code meaning the methods return the correct version specific type.
1 parent 97327e1 commit 1b1e2d9

File tree

11 files changed

+30
-82
lines changed

11 files changed

+30
-82
lines changed

client/src/client_sync/v19/blockchain.rs

-52
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,3 @@ macro_rules! impl_client_v19__getblockfilter {
2020
}
2121
};
2222
}
23-
24-
/// Implements Bitcoin Core JSON-RPC API method `getmempoolancestors`
25-
#[macro_export]
26-
macro_rules! impl_client_v19__getmempoolancestors {
27-
() => {
28-
impl Client {
29-
pub fn get_mempool_ancestors(&self, txid: Txid) -> Result<GetMempoolAncestors> {
30-
// Equivalent to self.call("getmempoolancestors", &[into_json(txid)?, into_json(false)?])
31-
self.call("getmempoolancestors", &[into_json(txid)?])
32-
}
33-
34-
pub fn get_mempool_ancestors_verbose(
35-
&self,
36-
txid: Txid,
37-
) -> Result<GetMempoolAncestorsVerbose> {
38-
self.call("getmempoolancestors", &[into_json(txid)?, into_json(true)?])
39-
}
40-
}
41-
};
42-
}
43-
44-
/// Implements Bitcoin Core JSON-RPC API method `getmempooldescendants`
45-
#[macro_export]
46-
macro_rules! impl_client_v19__getmempooldescendants {
47-
() => {
48-
impl Client {
49-
pub fn get_mempool_descendants(&self, txid: Txid) -> Result<GetMempoolDescendants> {
50-
// Equivalent to self.call("getmempooldescendants", &[into_json(txid)?, into_json(false)?])
51-
self.call("getmempooldescendants", &[into_json(txid)?])
52-
}
53-
54-
pub fn get_mempool_descendants_verbose(
55-
&self,
56-
txid: Txid,
57-
) -> Result<GetMempoolDescendantsVerbose> {
58-
self.call("getmempooldescendants", &[into_json(txid)?, into_json(true)?])
59-
}
60-
}
61-
};
62-
}
63-
64-
/// Implements Bitcoin Core JSON-RPC API method `getmempoolentry`
65-
#[macro_export]
66-
macro_rules! impl_client_v19__getmempoolentry {
67-
() => {
68-
impl Client {
69-
pub fn get_mempool_entry(&self, txid: Txid) -> Result<GetMempoolEntry> {
70-
self.call("getmempoolentry", &[into_json(txid)?])
71-
}
72-
}
73-
};
74-
}

client/src/client_sync/v19/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ crate::impl_client_v17__getblockstats!();
3434
crate::impl_client_v17__getchaintips!();
3535
crate::impl_client_v17__getchaintxstats!();
3636
crate::impl_client_v17__getdifficulty!();
37-
crate::impl_client_v19__getmempoolancestors!();
38-
crate::impl_client_v19__getmempooldescendants!();
39-
crate::impl_client_v19__getmempoolentry!();
37+
crate::impl_client_v17__getmempoolancestors!();
38+
crate::impl_client_v17__getmempooldescendants!();
39+
crate::impl_client_v17__getmempoolentry!();
4040
crate::impl_client_v17__getmempoolinfo!();
4141
crate::impl_client_v17__getrawmempool!();
4242
crate::impl_client_v17__gettxout!();

client/src/client_sync/v20.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
3131
crate::impl_client_v17__getchaintips!();
3232
crate::impl_client_v17__getchaintxstats!();
3333
crate::impl_client_v17__getdifficulty!();
34-
crate::impl_client_v19__getmempoolancestors!();
35-
crate::impl_client_v19__getmempooldescendants!();
36-
crate::impl_client_v19__getmempoolentry!();
34+
crate::impl_client_v17__getmempoolancestors!();
35+
crate::impl_client_v17__getmempooldescendants!();
36+
crate::impl_client_v17__getmempoolentry!();
3737
crate::impl_client_v17__getmempoolinfo!();
3838
crate::impl_client_v17__getrawmempool!();
3939
crate::impl_client_v17__gettxout!();

client/src/client_sync/v21/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ crate::impl_client_v17__getblockstats!();
3333
crate::impl_client_v17__getchaintips!();
3434
crate::impl_client_v17__getchaintxstats!();
3535
crate::impl_client_v17__getdifficulty!();
36-
crate::impl_client_v19__getmempoolancestors!();
37-
crate::impl_client_v19__getmempooldescendants!();
38-
crate::impl_client_v19__getmempoolentry!();
36+
crate::impl_client_v17__getmempoolancestors!();
37+
crate::impl_client_v17__getmempooldescendants!();
38+
crate::impl_client_v17__getmempoolentry!();
3939
crate::impl_client_v17__getmempoolinfo!();
4040
crate::impl_client_v17__getrawmempool!();
4141
crate::impl_client_v17__gettxout!();

client/src/client_sync/v22/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ crate::impl_client_v17__getblockstats!();
3434
crate::impl_client_v17__getchaintips!();
3535
crate::impl_client_v17__getchaintxstats!();
3636
crate::impl_client_v17__getdifficulty!();
37-
crate::impl_client_v19__getmempoolancestors!();
38-
crate::impl_client_v19__getmempooldescendants!();
39-
crate::impl_client_v19__getmempoolentry!();
37+
crate::impl_client_v17__getmempoolancestors!();
38+
crate::impl_client_v17__getmempooldescendants!();
39+
crate::impl_client_v17__getmempoolentry!();
4040
crate::impl_client_v17__getmempoolinfo!();
4141
crate::impl_client_v17__getrawmempool!();
4242
crate::impl_client_v22__gettxout!();

client/src/client_sync/v23/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ crate::impl_client_v17__getblockstats!();
3535
crate::impl_client_v17__getchaintips!();
3636
crate::impl_client_v17__getchaintxstats!();
3737
crate::impl_client_v17__getdifficulty!();
38-
crate::impl_client_v19__getmempoolancestors!();
39-
crate::impl_client_v19__getmempooldescendants!();
40-
crate::impl_client_v19__getmempoolentry!();
38+
crate::impl_client_v17__getmempoolancestors!();
39+
crate::impl_client_v17__getmempooldescendants!();
40+
crate::impl_client_v17__getmempoolentry!();
4141
crate::impl_client_v17__getmempoolinfo!();
4242
crate::impl_client_v17__getrawmempool!();
4343
crate::impl_client_v22__gettxout!();

client/src/client_sync/v24.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
3131
crate::impl_client_v17__getchaintips!();
3232
crate::impl_client_v17__getchaintxstats!();
3333
crate::impl_client_v17__getdifficulty!();
34-
crate::impl_client_v19__getmempoolancestors!();
35-
crate::impl_client_v19__getmempooldescendants!();
36-
crate::impl_client_v19__getmempoolentry!();
34+
crate::impl_client_v17__getmempoolancestors!();
35+
crate::impl_client_v17__getmempooldescendants!();
36+
crate::impl_client_v17__getmempoolentry!();
3737
crate::impl_client_v17__getmempoolinfo!();
3838
crate::impl_client_v17__getrawmempool!();
3939
crate::impl_client_v22__gettxout!();

client/src/client_sync/v25.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
3131
crate::impl_client_v17__getchaintips!();
3232
crate::impl_client_v17__getchaintxstats!();
3333
crate::impl_client_v17__getdifficulty!();
34-
crate::impl_client_v19__getmempoolancestors!();
35-
crate::impl_client_v19__getmempooldescendants!();
36-
crate::impl_client_v19__getmempoolentry!();
34+
crate::impl_client_v17__getmempoolancestors!();
35+
crate::impl_client_v17__getmempooldescendants!();
36+
crate::impl_client_v17__getmempoolentry!();
3737
crate::impl_client_v17__getmempoolinfo!();
3838
crate::impl_client_v17__getrawmempool!();
3939
crate::impl_client_v22__gettxout!();

client/src/client_sync/v26/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ crate::impl_client_v17__getblockstats!();
3535
crate::impl_client_v17__getchaintips!();
3636
crate::impl_client_v17__getchaintxstats!();
3737
crate::impl_client_v17__getdifficulty!();
38-
crate::impl_client_v19__getmempoolancestors!();
39-
crate::impl_client_v19__getmempooldescendants!();
40-
crate::impl_client_v19__getmempoolentry!();
38+
crate::impl_client_v17__getmempoolancestors!();
39+
crate::impl_client_v17__getmempooldescendants!();
40+
crate::impl_client_v17__getmempoolentry!();
4141
crate::impl_client_v17__getmempoolinfo!();
4242
crate::impl_client_v17__getrawmempool!();
4343
crate::impl_client_v22__gettxout!();

client/src/client_sync/v27.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
3131
crate::impl_client_v17__getchaintips!();
3232
crate::impl_client_v17__getchaintxstats!();
3333
crate::impl_client_v17__getdifficulty!();
34-
crate::impl_client_v19__getmempoolancestors!();
35-
crate::impl_client_v19__getmempooldescendants!();
36-
crate::impl_client_v19__getmempoolentry!();
34+
crate::impl_client_v17__getmempoolancestors!();
35+
crate::impl_client_v17__getmempooldescendants!();
36+
crate::impl_client_v17__getmempoolentry!();
3737
crate::impl_client_v17__getmempoolinfo!();
3838
crate::impl_client_v17__getrawmempool!();
3939
crate::impl_client_v22__gettxout!();

client/src/client_sync/v28/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ crate::impl_client_v17__getblockstats!();
3333
crate::impl_client_v17__getchaintips!();
3434
crate::impl_client_v17__getchaintxstats!();
3535
crate::impl_client_v17__getdifficulty!();
36-
crate::impl_client_v19__getmempoolancestors!();
37-
crate::impl_client_v19__getmempooldescendants!();
38-
crate::impl_client_v19__getmempoolentry!();
36+
crate::impl_client_v17__getmempoolancestors!();
37+
crate::impl_client_v17__getmempooldescendants!();
38+
crate::impl_client_v17__getmempoolentry!();
3939
crate::impl_client_v17__getmempoolinfo!();
4040
crate::impl_client_v17__getrawmempool!();
4141
crate::impl_client_v22__gettxout!();

0 commit comments

Comments
 (0)