use Conf::default() for tests

Author: RCasatta

src/lib.rs

@@ -150,6 +150,7 @@ impl BitcoinD {
                 Err(_) => TempDir::new(),
             },
         }?;
+        debug!("work_dir: {:?}", work_dir);
         let datadir = work_dir.path().to_path_buf();
         let cookie_file = datadir.join(conf.network).join(".cookie");
         let rpc_port = get_available_port()?;
@@ -329,15 +330,6 @@ mod test {
         assert_eq!(format!("127.0.0.1:{}", port), format!("{}", socket));
     }
 
-    #[test]
-    fn test_default() {
-        let conf = Conf {
-            p2p: P2P::Yes,
-            ..Default::default()
-        };
-        assert_eq!("regtest", conf.network);
-    }
-
     #[test]
     fn test_bitcoind() {
         let exe = init();
@@ -371,41 +363,33 @@ mod test {
     #[test]
     fn test_p2p() {
         let exe = init();
-        let conf = Conf {
-            p2p: P2P::Yes,
-            ..Default::default()
-        };
+        let mut conf = Conf::default();
+        conf.p2p = P2P::Yes;
+
         let bitcoind = BitcoinD::with_conf(&exe, &conf).unwrap();
         assert_eq!(bitcoind.client.get_peer_info().unwrap().len(), 0);
-        let other_conf = Conf {
-            p2p: bitcoind.p2p_connect(false).unwrap(),
-            ..Default::default()
-        };
+        let mut other_conf = Conf::default();
+        other_conf.p2p = bitcoind.p2p_connect(false).unwrap();
+
         let other_bitcoind = BitcoinD::with_conf(&exe, &other_conf).unwrap();
         assert_eq!(bitcoind.client.get_peer_info().unwrap().len(), 1);
         assert_eq!(other_bitcoind.client.get_peer_info().unwrap().len(), 1);
     }
 
     #[test]
     fn test_multi_p2p() {
-        let conf_node1 = Conf {
-            p2p: P2P::Yes,
-            ..Default::default()
-        };
+        let mut conf_node1 = Conf::default();
+        conf_node1.p2p = P2P::Yes;
         let node1 = BitcoinD::with_conf(exe_path(), &conf_node1).unwrap();
 
         // Create Node 2 connected Node 1
-        let conf_node2 = Conf {
-            p2p: node1.p2p_connect(true).unwrap(),
-            ..Default::default()
-        };
+        let mut conf_node2 = Conf::default();
+        conf_node2.p2p = node1.p2p_connect(true).unwrap();
         let node2 = BitcoinD::with_conf(exe_path(), &conf_node2).unwrap();
 
-        // Create Node 3 Connected To Node 2
-        let conf_node3 = Conf {
-            p2p: node2.p2p_connect(false).unwrap(),
-            ..Default::default()
-        };
+        // Create Node 3 Connected To Node
+        let mut conf_node3 = Conf::default();
+        conf_node3.p2p = node2.p2p_connect(false).unwrap();
         let node3 = BitcoinD::with_conf(exe_path(), &conf_node3).unwrap();
 
         // Get each nodes Peers