Merge pull request #153 from tcharding/05-09-client-dups

client: Remove duplicate macros

Author: tcharding

client/src/client_sync/v19/blockchain.rs

@@ -20,55 +20,3 @@ macro_rules! impl_client_v19__getblockfilter {
         }
     };
 }
-
-/// Implements Bitcoin Core JSON-RPC API method `getmempoolancestors`
-#[macro_export]
-macro_rules! impl_client_v19__getmempoolancestors {
-    () => {
-        impl Client {
-            pub fn get_mempool_ancestors(&self, txid: Txid) -> Result<GetMempoolAncestors> {
-                // Equivalent to self.call("getmempoolancestors", &[into_json(txid)?, into_json(false)?])
-                self.call("getmempoolancestors", &[into_json(txid)?])
-            }
-
-            pub fn get_mempool_ancestors_verbose(
-                &self,
-                txid: Txid,
-            ) -> Result<GetMempoolAncestorsVerbose> {
-                self.call("getmempoolancestors", &[into_json(txid)?, into_json(true)?])
-            }
-        }
-    };
-}
-
-/// Implements Bitcoin Core JSON-RPC API method `getmempooldescendants`
-#[macro_export]
-macro_rules! impl_client_v19__getmempooldescendants {
-    () => {
-        impl Client {
-            pub fn get_mempool_descendants(&self, txid: Txid) -> Result<GetMempoolDescendants> {
-                // Equivalent to self.call("getmempooldescendants", &[into_json(txid)?, into_json(false)?])
-                self.call("getmempooldescendants", &[into_json(txid)?])
-            }
-
-            pub fn get_mempool_descendants_verbose(
-                &self,
-                txid: Txid,
-            ) -> Result<GetMempoolDescendantsVerbose> {
-                self.call("getmempooldescendants", &[into_json(txid)?, into_json(true)?])
-            }
-        }
-    };
-}
-
-/// Implements Bitcoin Core JSON-RPC API method `getmempoolentry`
-#[macro_export]
-macro_rules! impl_client_v19__getmempoolentry {
-    () => {
-        impl Client {
-            pub fn get_mempool_entry(&self, txid: Txid) -> Result<GetMempoolEntry> {
-                self.call("getmempoolentry", &[into_json(txid)?])
-            }
-        }
-    };
-}

client/src/client_sync/v19/mod.rs

@@ -34,9 +34,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+crate::impl_client_v17__getmempooldescendants!();
+crate::impl_client_v17__getmempoolentry!();
 crate::impl_client_v17__getmempoolinfo!();
 crate::impl_client_v17__getrawmempool!();
 crate::impl_client_v17__gettxout!();

client/src/client_sync/v20.rs

@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+crate::impl_client_v17__getmempooldescendants!();
+crate::impl_client_v17__getmempoolentry!();
 crate::impl_client_v17__getmempoolinfo!();
 crate::impl_client_v17__getrawmempool!();
 crate::impl_client_v17__gettxout!();

client/src/client_sync/v21/mod.rs

@@ -33,9 +33,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+crate::impl_client_v17__getmempooldescendants!();
+crate::impl_client_v17__getmempoolentry!();
 crate::impl_client_v17__getmempoolinfo!();
 crate::impl_client_v17__getrawmempool!();
 crate::impl_client_v17__gettxout!();

client/src/client_sync/v22/mod.rs

@@ -34,9 +34,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();

client/src/client_sync/v23/mod.rs

@@ -35,9 +35,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();

client/src/client_sync/v24.rs

@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();

client/src/client_sync/v25.rs

@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();

client/src/client_sync/v26/mod.rs

@@ -35,9 +35,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();

client/src/client_sync/v27.rs

@@ -31,9 +31,9 @@ crate::impl_client_v17__getblockstats!();
 crate::impl_client_v17__getchaintips!();
 crate::impl_client_v17__getchaintxstats!();
 crate::impl_client_v17__getdifficulty!();
-crate::impl_client_v19__getmempoolancestors!();
-crate::impl_client_v19__getmempooldescendants!();
-crate::impl_client_v19__getmempoolentry!();
+crate::impl_client_v17__getmempoolancestors!();
+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!();