v17: Add support for network methods (#39)

Add support to the `v17` client and integration tests for network
section methods.

Note, we do not implement `into_model` for the network methods because
apart from `FeeRate` there are no `rust-bitcoin` types required.

Note also `getaddednodeinfo` is untested because without configuring the
network it returns an empty list so a test within the current framework
would be smoke and mirrors.

Author: tcharding

client/src/client_sync/v17/mod.rs

@@ -19,6 +19,7 @@ use crate::client_sync::{handle_defaults, into_json};
 use crate::json::v17::*;
 
 crate::define_jsonrpc_minreq_client!("v17");
+crate::impl_client_check_expected_server_version!({ [170100] });
 
 // == Blockchain ==
 crate::impl_client_v17__getblockchaininfo!();
@@ -45,8 +46,9 @@ crate::impl_client_v17__generatetoaddress!();
 crate::impl_client_v17__generate!();
 
 // == Network ==
+crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();
-crate::impl_client_check_expected_server_version!({ [170100] });
+crate::impl_client_v17__getpeerinfo!();
 
 // == Rawtransactions ==
 crate::impl_client_v17__sendrawtransaction!();

client/src/client_sync/v17/network.rs

@@ -9,6 +9,16 @@
 //!
 //! See, or use the `define_jsonrpc_minreq_client!` macro to define a `Client`.
 
+/// Implements bitcoind JSON-RPC API method `getnettotals`
+#[macro_export]
+macro_rules! impl_client_v17__getnettotals {
+    () => {
+        impl Client {
+            pub fn get_net_totals(&self) -> Result<GetNetTotals> { self.call("getnettotals", &[]) }
+        }
+    };
+}
+
 /// Implements bitcoind JSON-RPC API method `getnetworkinfo`
 #[macro_export]
 macro_rules! impl_client_v17__getnetworkinfo {
@@ -26,3 +36,13 @@ macro_rules! impl_client_v17__getnetworkinfo {
         }
     };
 }
+
+/// Implements bitcoind JSON-RPC API method `getpeerinfo`
+#[macro_export]
+macro_rules! impl_client_v17__getpeerinfo {
+    () => {
+        impl Client {
+            pub fn get_peer_info(&self) -> Result<GetPeerInfo> { self.call("getpeerinfo", &[]) }
+        }
+    };
+}

integration_test/src/v17/network.rs

@@ -5,17 +5,40 @@
 //! Specifically this is methods found under the `== Network ==` section of the
 //! API docs of `bitcoind v0.17.1`.
 
+/// Requires `Client` to be in scope and to implement `get_network_info`.
+#[macro_export]
+macro_rules! impl_test_v17__getnettotals {
+    () => {
+        #[test]
+        fn get_net_totals() {
+            let bitcoind = $crate::bitcoind_no_wallet();
+            let _ = bitcoind.client.get_net_totals().expect("getnettotals");
+        }
+    };
+}
+
 /// Requires `Client` to be in scope and to implement `get_network_info`.
 #[macro_export]
 macro_rules! impl_test_v17__getnetworkinfo {
     () => {
         #[test]
         fn get_network_info() {
             let bitcoind = $crate::bitcoind_no_wallet();
-            let json = bitcoind.client.get_network_info().expect("getnetworkinfo");
-            json.into_model().unwrap();
+            let _ = bitcoind.client.get_network_info().expect("getnetworkinfo");
 
             bitcoind.client.check_expected_server_version().expect("unexpected version");
         }
     };
 }
+
+/// Requires `Client` to be in scope and to implement `get_peer_info`.
+#[macro_export]
+macro_rules! impl_test_v17__getpeerinfo {
+    () => {
+        #[test]
+        fn get_peer_info() {
+            let bitcoind = $crate::bitcoind_no_wallet();
+            let _ = bitcoind.client.get_peer_info().expect("getpeerinfo");
+        }
+    };
+}

integration_test/tests/v17_api.rs

@@ -43,7 +43,9 @@ mod generating {
 mod network {
     use super::*;
 
+    impl_test_v17__getnettotals!();
     impl_test_v17__getnetworkinfo!();
+    impl_test_v17__getpeerinfo!();
 }
 
 // == Rawtransactions ==

json/src/model/mod.rs

@@ -12,7 +12,6 @@ mod blockchain;
 mod control;
 mod generating;
 mod mining;
-mod network;
 mod raw_transactions;
 mod util;
 mod wallet;
@@ -33,7 +32,6 @@ pub use self::{
         GetMempoolAncestorsVerbose, GetTxOut, Softfork, SoftforkType,
     },
     generating::{Generate, GenerateToAddress},
-    network::{GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoNetwork},
     raw_transactions::SendRawTransaction,
     wallet::{
         CreateWallet, GetBalance, GetBalances, GetBalancesMine, GetBalancesWatchOnly,

json/src/model/network.rs

@@ -57,18 +57,18 @@
 //! - [ ] `submitblock "hexdata"  ( "dummy" )`
 //!
 //! **== Network ==**
-//! - [ ] `addnode "node" "add|remove|onetry"`
-//! - [ ] `clearbanned`
-//! - [ ] `disconnectnode "[address]" [nodeid]`
+//! - [-] `addnode "node" "add|remove|onetry"`
+//! - [-] `clearbanned`
+//! - [-] `disconnectnode "[address]" [nodeid]`
 //! - [ ] `getaddednodeinfo ( "node" )`
-//! - [ ] `getconnectioncount`
-//! - [ ] `getnettotals`
+//! - [-] `getconnectioncount`
+//! - [x] `getnettotals`
 //! - [x] `getnetworkinfo`
-//! - [ ] `getpeerinfo`
-//! - [ ] `listbanned`
-//! - [ ] `ping`
-//! - [ ] `setban "subnet" "add|remove" (bantime) (absolute)`
-//! - [ ] `setnetworkactive true|false`
+//! - [x] `getpeerinfo`
+//! - [-] `listbanned`
+//! - [-] `ping`
+//! - [-] `setban "subnet" "add|remove" (bantime) (absolute)`
+//! - [-] `setnetworkactive true|false`
 //!
 //! **== Rawtransactions ==**
 //! - [ ] `combinepsbt ["psbt",...]`
@@ -179,7 +179,10 @@ pub use self::{
     },
     control::{GetMemoryInfoStats, Locked, Logging, Uptime},
     generating::{Generate, GenerateToAddress},
-    network::{GetNetworkInfo, GetNetworkInfoAddress, GetNetworkInfoNetwork},
+    network::{
+        AddedNodeAddress, BytesPerMessage, GetAddedNodeInfo, GetNetTotals, GetNetworkInfo,
+        GetNetworkInfoAddress, GetNetworkInfoNetwork, GetPeerInfo, PeerInfo, UploadTarget,
+    },
     raw_transactions::SendRawTransaction,
     wallet::{
         CreateWallet, GetBalance, GetNewAddress, GetTransaction, GetTransactionDetail,