Implement disconnectnode method and test

Author: GideonBature

client/src/client_sync/v17/mod.rs

@@ -73,6 +73,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v17/network.rs

@@ -41,6 +41,22 @@ macro_rules! impl_client_v17__clearbanned {
     };
 }
 
+/// Implements Bitcoin Core JSON-RPC API method `disconnectnode`
+#[macro_export]
+macro_rules! impl_client_v17__disconnectnode {
+    () => {
+        impl Client {
+            pub fn disconnect_node(&self, address: &str) -> Result<()> {
+                match self.call("disconnectnode", &[into_json(address)?]) {
+                    Ok(serde_json::Value::Null) => Ok(()),
+                    Ok(res) => Err(Error::Returned(res.to_string())),
+                    Err(err) => Err(err.into()),
+                }
+            }
+        }
+    };
+}
+
 /// Implements Bitcoin Core JSON-RPC API method `getaddednodeinfo`
 #[macro_export]
 macro_rules! impl_client_v17__getaddednodeinfo {

client/src/client_sync/v18/mod.rs

@@ -77,6 +77,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v19/mod.rs

@@ -75,6 +75,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v20.rs

@@ -72,6 +72,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v21/mod.rs

@@ -74,6 +74,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v22/mod.rs

@@ -74,6 +74,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v23/mod.rs

@@ -76,6 +76,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v24.rs

@@ -73,6 +73,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v25.rs

@@ -73,6 +73,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v26/mod.rs

@@ -78,6 +78,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v27.rs

@@ -74,6 +74,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v28/mod.rs

@@ -76,6 +76,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v29/mod.rs

@@ -76,6 +76,7 @@ crate::impl_client_v17__submitblock!();
 // == Network ==
 crate::impl_client_v17__addnode!();
 crate::impl_client_v17__clearbanned!();
+crate::impl_client_v17__disconnectnode!();
 crate::impl_client_v17__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

integration_test/tests/network.rs

@@ -33,6 +33,16 @@ fn network__clear_banned() {
     node.client.clear_banned().expect("clearbanned");
 }
 
+#[test]
+fn network__disconnect_node() {
+    let (_node1, node2, _node3) = integration_test::three_node_network();
+
+    let peers = node2.client.get_peer_info().expect("getpeerinfo");
+    let peer = peers.0.first().expect("should have at least one peer");
+
+    node2.client.disconnect_node(&peer.address).expect("disconnectnode");
+}
+
 #[test]
 fn network__get_added_node_info() {
     let node = Node::with_wallet(Wallet::None, &[]);