Merge #204: Reduce duplication using conditional initialization in addnode test

a2e2092 Reduce duplication using conditional initialization in addnode test (GideonBature)

Pull request description:

  This is done to reduce the duplication of code in the add_node test. It is also done to maintain consistency with existing tests already using such approach.

ACKs for top commit:
  tcharding:
    ACK a2e2092

Tree-SHA512: d64ba3caea2158d3932457ad6a361a40a81033f3e0ccbd63347bacc8abaa48179ecb95b75f5a30e9c761baa11259f00a72e9f719edc48eb30f1aba0c94fd12c4

Author: tcharding

integration_test/tests/network.rs

@@ -10,23 +10,18 @@ use node::{AddNodeCommand, mtype, SetBanCommand};
 
 #[test]
 fn network__add_node() {
-    let dummy_peer = "192.0.2.1:8333";
+    let node = match () {
+        #[cfg(feature = "v25_and_below")]
+        () => Node::with_wallet(Wallet::None, &[]),
+        #[cfg(not(feature = "v25_and_below"))]
+        () => Node::with_wallet(Wallet::None, &["-v2transport"]),
+    };
 
-    #[cfg(feature = "v25_and_below")]
-    {
-        let node = Node::with_wallet(Wallet::None, &[]);
-        node.client.add_node(dummy_peer, AddNodeCommand::OneTry).expect("addnode onetry");
-        node.client.add_node(dummy_peer, AddNodeCommand::Add).expect("addnode add");
-        node.client.add_node(dummy_peer, AddNodeCommand::Remove).expect("addnode remove");
-    }
+    let dummy_peer = "192.0.2.1:8333";
 
-    #[cfg(not(feature = "v25_and_below"))]
-    {
-        let node = Node::with_wallet(Wallet::None, &["-v2transport"]);
-        node.client.add_node(dummy_peer, AddNodeCommand::OneTry).expect("addnode onetry");
-        node.client.add_node(dummy_peer, AddNodeCommand::Add).expect("addnode add");
-        node.client.add_node(dummy_peer, AddNodeCommand::Remove).expect("addnode remove");
-    }
+    node.client.add_node(dummy_peer, AddNodeCommand::OneTry).expect("addnode onetry");
+    node.client.add_node(dummy_peer, AddNodeCommand::Add).expect("addnode add");
+    node.client.add_node(dummy_peer, AddNodeCommand::Remove).expect("addnode remove");
 }
 
 #[test]