Merged in Review 3

Author: dnwiebe

node/src/neighborhood/mod.rs

@@ -2216,8 +2216,7 @@ mod tests {
     use crate::sub_lib::host::Host;
     use crate::sub_lib::neighborhood::ExpectedServices::OneWay;
     use crate::sub_lib::neighborhood::{
-        AskAboutDebutGossipMessage, ConfigChange, ConfigChangeMsg,
-        NeighborhoodMode, WalletPair,
+        AskAboutDebutGossipMessage, ConfigChange, ConfigChangeMsg, NeighborhoodMode, WalletPair,
     };
     use crate::sub_lib::neighborhood::{NeighborhoodConfig, DEFAULT_RATE_PACK};
     use crate::sub_lib::neighborhood::{NeighborhoodMetadata, RatePack};

node/src/node_configurator/mod.rs

@@ -350,9 +350,7 @@ mod tests {
     use super::*;
     use crate::node_test_utils::DirsWrapperMock;
     use crate::test_utils::{assert_string_contains, ArgsBuilder};
-    use masq_lib::shared_schema::{
-        config_file_arg, data_directory_arg, DATA_DIRECTORY_HELP,
-    };
+    use masq_lib::shared_schema::{config_file_arg, data_directory_arg, DATA_DIRECTORY_HELP};
     use masq_lib::test_utils::environment_guard::EnvironmentGuard;
     use masq_lib::test_utils::utils::ensure_node_home_directory_exists;
     use masq_lib::utils::find_free_port;
@@ -404,7 +402,10 @@ mod tests {
         assert_string_contains(&param_error.reason, "error:");
         assert_string_contains(&param_error.reason, "Found argument '");
         assert_string_contains(&param_error.reason, "--booga-booga");
-        assert_string_contains(&param_error.reason, "' which wasn't expected, or isn't valid in this context");
+        assert_string_contains(
+            &param_error.reason,
+            "' which wasn't expected, or isn't valid in this context",
+        );
     }
 
     #[test]

node/src/proxy_server/mod.rs

@@ -5910,10 +5910,7 @@ mod tests {
         system.run();
         let recording = hopper_recording_arc.lock().unwrap();
         let record = recording.get_record::<IncipientCoresPackage>(0);
-        assert_eq!(
-            record.route,
-            affected_route
-        );
+        assert_eq!(record.route, affected_route);
         let payload = decodex::<MessageType>(&affected_cryptde, &record.payload).unwrap();
         match payload {
             MessageType::ClientRequest(vd) => assert_eq!(
@@ -6043,10 +6040,7 @@ mod tests {
         system.run();
         let recording = hopper_recording_arc.lock().unwrap();
         let record = recording.get_record::<IncipientCoresPackage>(0);
-        assert_eq!(
-            record.route,
-            affected_route
-        );
+        assert_eq!(record.route, affected_route);
         let payload = decodex::<MessageType>(&affected_cryptde, &record.payload).unwrap();
         match payload {
             MessageType::ClientRequest(vd) => assert_eq!(
@@ -6390,7 +6384,8 @@ mod tests {
 
     #[test]
     fn new_http_request_creates_new_exhausted_entry_inside_dns_retries_hashmap_zero_hop() {
-        let test_name = "new_http_request_creates_new_exhausted_entry_inside_dns_retries_hashmap_zero_hop";
+        let test_name =
+            "new_http_request_creates_new_exhausted_entry_inside_dns_retries_hashmap_zero_hop";
         let http_request = b"GET /index.html HTTP/1.1\r\nHost: nowhere.com\r\n\r\n";
         let (neighborhood_mock, _, _) = make_recorder();
         let destination_key = PublicKey::from(&b"our destination"[..]);