Disable Rpc module for other tests to prevent port conflicts

tests/multinode.rs

@@ -145,7 +145,14 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
         writer.write_entries(entries).unwrap();
     }
 
-    let leader = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
+    let leader = Fullnode::new(
+        leader,
+        true,
+        &leader_ledger_path,
+        leader_keypair,
+        None,
+        false,
+    );
 
     // Send leader some tokens to vote
     let leader_balance =
@@ -163,6 +170,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
         &zero_ledger_path,
         keypair,
         Some(leader_data.contact_info.ncp),
+        false,
     );
 
     // contains the leader and new node
@@ -218,7 +226,14 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
     );
     ledger_paths.push(zero_ledger_path.clone());
 
-    let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
+    let server = Fullnode::new(
+        leader,
+        true,
+        &leader_ledger_path,
+        leader_keypair,
+        None,
+        false,
+    );
 
     // Send leader some tokens to vote
     let leader_balance =
@@ -241,6 +256,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
             &ledger_path,
             keypair,
             Some(leader_data.contact_info.ncp),
+            false,
         );
         nodes.push(val);
     }
@@ -276,6 +292,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
         &zero_ledger_path,
         keypair,
         Some(leader_data.contact_info.ncp),
+        false,
     );
     nodes.push(val);
     //contains the leader and new node
@@ -335,7 +352,14 @@ fn test_multi_node_basic() {
 
     let (alice, leader_ledger_path) = genesis("multi_node_basic", 10_000);
     ledger_paths.push(leader_ledger_path.clone());
-    let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
+    let server = Fullnode::new(
+        leader,
+        true,
+        &leader_ledger_path,
+        leader_keypair,
+        None,
+        false,
+    );
 
     // Send leader some tokens to vote
     let leader_balance =
@@ -354,6 +378,7 @@ fn test_multi_node_basic() {
             &ledger_path,
             keypair,
             Some(leader_data.contact_info.ncp),
+            false,
         );
         nodes.push(val);
     }
@@ -396,7 +421,14 @@ fn test_boot_validator_from_file() -> result::Result<()> {
     ledger_paths.push(leader_ledger_path.clone());
 
     let leader_data = leader.data.clone();
-    let leader_fullnode = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
+    let leader_fullnode = Fullnode::new(
+        leader,
+        true,
+        &leader_ledger_path,
+        leader_keypair,
+        None,
+        false,
+    );
     let leader_balance =
         send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, Some(500)).unwrap();
     assert_eq!(leader_balance, 500);
@@ -415,6 +447,7 @@ fn test_boot_validator_from_file() -> result::Result<()> {
         &ledger_path,
         keypair,
         Some(leader_data.contact_info.ncp),
+        false,
     );
     let mut client = mk_client(&validator_data);
     let getbal = retry_get_balance(&mut client, &bob_pubkey, Some(leader_balance));
@@ -433,7 +466,7 @@ fn create_leader(ledger_path: &str) -> (NodeInfo, Fullnode) {
     let leader_keypair = Keypair::new();
     let leader = TestNode::new_localhost_with_pubkey(leader_keypair.pubkey());
     let leader_data = leader.data.clone();
-    let leader_fullnode = Fullnode::new(leader, true, &ledger_path, leader_keypair, None);
+    let leader_fullnode = Fullnode::new(leader, true, &ledger_path, leader_keypair, None, false);
     (leader_data, leader_fullnode)
 }
 
@@ -484,6 +517,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
         &stale_ledger_path,
         keypair,
         Some(leader_data.contact_info.ncp),
+        false,
     );
 
     // trigger broadcast, validator should catch up from leader, whose window contains
@@ -538,8 +572,14 @@ fn test_multi_node_dynamic_network() {
     let alice_arc = Arc::new(RwLock::new(alice));
     let leader_data = leader.data.clone();
 
-    let server =
-        Fullnode::new_without_sigverify(leader, true, &leader_ledger_path, leader_keypair, None);
+    let server = Fullnode::new_without_sigverify(
+        leader,
+        true,
+        &leader_ledger_path,
+        leader_keypair,
+        None,
+        false,
+    );
 
     // Send leader some tokens to vote
     let leader_balance = send_tx_and_retry_get_balance(
@@ -613,6 +653,7 @@ fn test_multi_node_dynamic_network() {
                         &ledger_path,
                         keypair,
                         Some(leader_data.contact_info.ncp),
+                        false,
                     );
                     (rd, val)
                 })