GH-826 zero-hop as default neighborhood-mode review addressed

masq/tests/startup_shutdown_tests_integration.rs

@@ -85,7 +85,7 @@ fn masq_terminates_based_on_loss_of_connection_to_the_daemon_integration() {
     assert_eq!(exit_code, None);
     #[cfg(target_os = "windows")]
     assert_eq!(exit_code.unwrap(), 1);
-    assert!(stdout.contains("neighborhood-mode             standard                                                         Default"));
+    assert!(stdout.contains("neighborhood-mode             zero-hop                                                         Default"));
     assert_eq!(
         stderr,
         "\nThe Daemon is no longer running; masq is terminating.\n\n"

node/src/bootstrapper.rs

@@ -1163,6 +1163,8 @@ mod tests {
                     "5123",
                     "--data-directory",
                     data_dir.to_str().unwrap(),
+                    "--neighborhood-mode",
+                    "standard",
                 ]),
                 &mut FakeStreamHolder::new().streams(),
             )
@@ -1285,6 +1287,8 @@ mod tests {
                     "1.2.3.4",
                     "--clandestine-port",
                     "5123",
+                    "--neighborhood-mode",
+                    "standard",
                 ]),
                 &mut FakeStreamHolder::new().streams(),
             )
@@ -1338,6 +1342,8 @@ mod tests {
                     data_dir.to_str().unwrap(),
                     "--clandestine-port",
                     "5124",
+                    "--neighborhood-mode",
+                    "standard",
                 ]),
                 &mut holder.streams(),
             )
@@ -1655,6 +1661,8 @@ mod tests {
                     "1.2.3.4",
                     "--data-directory",
                     data_dir.to_str().unwrap(),
+                    "--neighborhood-mode",
+                    "standard",
                 ]),
                 &mut holder.streams(),
             )

node/src/daemon/setup_reporter.rs

@@ -986,7 +986,7 @@ impl ValueRetriever for NeighborhoodMode {
         _persistent_config: &dyn PersistentConfiguration,
         _db_password_opt: &Option<String>,
     ) -> Option<(String, UiSetupResponseValueStatus)> {
-        Some(("standard".to_string(), Default))
+        Some(("zero-hop".to_string(), Default))
     }
 
     fn is_required(&self, _params: &SetupCluster) -> bool {
@@ -1448,7 +1448,7 @@ mod tests {
             ("log-level", "warn", Default),
             ("mapping-protocol", "", Blank),
             ("min-hops", &DEFAULT_MIN_HOPS.to_string(), Default),
-            ("neighborhood-mode", "standard", Default),
+            ("neighborhood-mode", "zero-hop", Default),
             (
                 "neighbors",
                 "masq://eth-mainnet:[email protected]:1234,masq://eth-mainnet:[email protected]:5678",
@@ -1459,7 +1459,7 @@ mod tests {
                 &DEFAULT_PAYMENT_THRESHOLDS.to_string(),
                 Default,
             ),
-            ("rate-pack", &DEFAULT_RATE_PACK.to_string(), Default),
+            ("rate-pack", &"".to_string(), Blank),
             #[cfg(not(target_os = "windows"))]
             (
                 "real-user",
@@ -3287,7 +3287,7 @@ mod tests {
             &None,
         );
 
-        assert_eq!(result, Some(("standard".to_string(), Default)))
+        assert_eq!(result, Some(("zero-hop".to_string(), Default)))
     }
 
     #[test]

node/src/node_configurator/unprivileged_parse_args_configuration.rs

@@ -304,10 +304,7 @@ fn make_neighborhood_mode(
             "--neighborhood-mode {} has not been properly provided for in the code",
             s
         ),
-        None => {
-            let rate_pack = configure_rate_pack(multi_config, persistent_config)?;
-            neighborhood_mode_standard(multi_config, neighbor_configs, rate_pack)
-        }
+        None => Ok(NeighborhoodMode::ZeroHop),
     }
 }
 
@@ -1537,33 +1534,7 @@ mod tests {
                     .unwrap()
             )),
         );
-        assert_eq!(
-            config.neighborhood_config.mode,
-            NeighborhoodMode::Standard(
-                NodeAddr::new(&IpAddr::from_str("34.56.78.90").unwrap(), &[]),
-                vec![
-                    NodeDescriptor::try_from((
-                        CRYPTDE_PAIR.main.as_ref(),
-                        format!(
-                            "masq://{}:[email protected]:1234/2345",
-                            DEFAULT_CHAIN.rec().literal_identifier
-                        )
-                        .as_str()
-                    ))
-                    .unwrap(),
-                    NodeDescriptor::try_from((
-                        CRYPTDE_PAIR.main.as_ref(),
-                        format!(
-                            "masq://{}:[email protected]:3456/4567",
-                            DEFAULT_CHAIN.rec().literal_identifier
-                        )
-                        .as_str()
-                    ))
-                    .unwrap(),
-                ],
-                DEFAULT_RATE_PACK.clone()
-            )
-        );
+        assert_eq!(config.neighborhood_config.mode, NeighborhoodMode::ZeroHop);
         assert_eq!(config.db_password_opt, Some(password.to_string()));
         assert_eq!(config.mapping_protocol_opt, Some(AutomapProtocol::Pcp));
     }
@@ -1597,15 +1568,7 @@ mod tests {
             .mode
             .neighbor_configs()
             .is_empty());
-        assert_eq!(
-            config
-                .neighborhood_config
-                .mode
-                .node_addr_opt()
-                .unwrap()
-                .ip_addr(),
-            IpAddr::from_str("0.0.0.0").unwrap(),
-        );
+        assert_eq!(config.neighborhood_config.mode.node_addr_opt(), None,);
         assert_eq!(config.earning_wallet, DEFAULT_EARNING_WALLET.clone(),);
         assert_eq!(config.consuming_wallet_opt, None);
         assert_eq!(config.mapping_protocol_opt, None);
@@ -1655,21 +1618,7 @@ mod tests {
             )
             .unwrap();
 
-        assert_eq!(
-            config.neighborhood_config.mode.neighbor_configs(),
-            &[
-                NodeDescriptor::try_from((
-                    CRYPTDE_PAIR.main.as_ref(),
-                    "masq://eth-ropsten:[email protected]:1234"
-                ))
-                .unwrap(),
-                NodeDescriptor::try_from((
-                    CRYPTDE_PAIR.main.as_ref(),
-                    "masq://eth-ropsten:[email protected]:2345"
-                ))
-                .unwrap(),
-            ]
-        );
+        assert_eq!(config.neighborhood_config.mode.neighbor_configs(), &[]);
         let past_neighbors_params = past_neighbors_params_arc.lock().unwrap();
         assert_eq!(past_neighbors_params[0], "password".to_string());
         assert_eq!(config.mapping_protocol_opt, Some(AutomapProtocol::Pcp));