Merge #203: Implement clearbanned method and test

42c1e22 Implement clearbanned method and test (GideonBature)

Pull request description:

  Going by the conversations with tcharding for PR [#116 ](#116) on implementing one method at a time for easier review: This is the clearbanned method which is a specific type that returns a (json null). Once this is approved, I’ll proceed with the next one.

ACKs for top commit:
  tcharding:
    ACK 42c1e22

Tree-SHA512: 24b86868139c63d682423e93b362dcb930b4d2ed909b099786612b8a52c2ba993c8323b2332aa45e6c58097a412187e07508fc847ab228dc09499e301b3b3fb2

Author: tcharding

client/src/client_sync/v17/mod.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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v17/network.rs

@@ -25,6 +25,22 @@ macro_rules! impl_client_v17__addnode {
     };
 }
 
+/// Implements Bitcoin Core JSON-RPC API method `clearbanned`
+#[macro_export]
+macro_rules! impl_client_v17__clearbanned {
+    () => {
+        impl Client {
+            pub fn clear_banned(&self) -> Result<()> {
+                match self.call("clearbanned", &[]) {
+                    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

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

client/src/client_sync/v19/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v20.rs

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

client/src/client_sync/v21/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v22/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v23/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v24.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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v25.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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v26/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v27.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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v28/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

client/src/client_sync/v29/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__getaddednodeinfo!();
 crate::impl_client_v17__getnettotals!();
 crate::impl_client_v17__getnetworkinfo!();

integration_test/tests/network.rs

@@ -24,6 +24,15 @@ fn network__add_node() {
     node.client.add_node(dummy_peer, AddNodeCommand::Remove).expect("addnode remove");
 }
 
+#[test]
+fn network__clear_banned() {
+    let node = Node::with_wallet(Wallet::None, &[]);
+    let dummy_subnet = "192.0.2.2";
+
+    node.client.set_ban(dummy_subnet, SetBanCommand::Add).expect("setban add");
+    node.client.clear_banned().expect("clearbanned");
+}
+
 #[test]
 fn network__get_added_node_info() {
     let node = Node::with_wallet(Wallet::None, &[]);