Merge pull request rust-bitcoin#85 from tcharding/03-10-control

Add support for all control methods

Author: tcharding

client/src/client_sync/v17/control.rs

@@ -9,7 +9,7 @@
 //!
 //! See or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
-/// Implements Bitcoin Core JSON-RPC API method `getmemory`
+/// Implements Bitcoin Core JSON-RPC API method `getmemoryinfo`.
 #[macro_export]
 macro_rules! impl_client_v17__getmemoryinfo {
     () => {
@@ -21,7 +21,17 @@ macro_rules! impl_client_v17__getmemoryinfo {
     };
 }
 
-/// Implements Bitcoin Core JSON-RPC API method `logging`
+/// Implements Bitcoin Core JSON-RPC API method `help`.
+#[macro_export]
+macro_rules! impl_client_v17__help {
+    () => {
+        impl Client {
+            pub fn help(&self) -> Result<String> { self.call("help", &[]) }
+        }
+    };
+}
+
+/// Implements Bitcoin Core JSON-RPC API method `logging`.
 #[macro_export]
 macro_rules! impl_client_v17__logging {
     () => {
@@ -31,7 +41,7 @@ macro_rules! impl_client_v17__logging {
     };
 }
 
-/// Implements Bitcoin Core JSON-RPC API method `stop`
+/// Implements Bitcoin Core JSON-RPC API method `stop`.
 #[macro_export]
 macro_rules! impl_client_v17__stop {
     () => {
@@ -41,7 +51,7 @@ macro_rules! impl_client_v17__stop {
     };
 }
 
-/// Implements Bitcoin Core JSON-RPC API method `uptime`
+/// Implements Bitcoin Core JSON-RPC API method `uptime`.
 #[macro_export]
 macro_rules! impl_client_v17__uptime {
     () => {

client/src/client_sync/v17/mod.rs

@@ -78,6 +78,7 @@ crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v17__help!();
 crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
 crate::impl_client_v17__uptime!();

client/src/client_sync/v18/control.rs

@@ -0,0 +1,18 @@
+//! Macros for implementing JSON-RPC methods on a client.
+//!
+//! Specifically this is methods found under the `== Control ==` section of the
+//! API docs of Bitcoin Core `v0.18`.
+//!
+//! 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 `getrpcinfo`.
+#[macro_export]
+macro_rules! impl_client_v18__getrpcinfo {
+    () => {
+        impl Client {
+            pub fn get_rpc_info(&self) -> Result<GetRpcInfo> { self.call("getrpcinfo", &[]) }
+        }
+    };
+}

client/src/client_sync/v18.rs client/src/client_sync/v18/mod.rsclient/src/client_sync/v18.rs renamed to client/src/client_sync/v18/mod.rs

@@ -4,6 +4,8 @@
 //!
 //! We ignore option arguments unless they effect the shape of the returned JSON data.
 
+pub mod control;
+
 use std::path::Path;
 
 use bitcoin::address::{Address, NetworkChecked};
@@ -41,6 +43,8 @@ crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
 crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
 crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
 crate::impl_client_v17__uptime!();

client/src/client_sync/v19/mod.rs

@@ -37,7 +37,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();

client/src/client_sync/v20.rs

@@ -37,7 +37,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();

client/src/client_sync/v21.rs

@@ -37,7 +37,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();

client/src/client_sync/v22/mod.rs

@@ -37,7 +37,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();

client/src/client_sync/v23.rs

@@ -35,7 +35,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();

client/src/client_sync/v24.rs

@@ -37,7 +37,12 @@ crate::impl_client_v17__gettxoutsetinfo!();
 crate::impl_client_v17__verifytxoutproof!();
 
 // == Control ==
+crate::impl_client_v17__getmemoryinfo!();
+crate::impl_client_v18__getrpcinfo!();
+crate::impl_client_v17__help!();
+crate::impl_client_v17__logging!();
 crate::impl_client_v17__stop!();
+crate::impl_client_v17__uptime!();
 
 // == Generating ==
 crate::impl_client_v17__generatetoaddress!();