GH-625: Log message enhancements, plus clippy appeasement (#153)

* Log message enhancements, plus clippy appeasement

* GH-627: Clippy should be happy again by now

* GH-627: one line was silly

* GH-627: starting ignoring the troublesome test again

* GH-627: there was a formatting issue

* handles_startup_and_shutdown_integration now doesn't run in Actions on Windows

* handles_startup_and_shutdown_integration now doesn't run in Actions on Windows

* Added import

* GH-625: Formatting

* GH-625: Remember to return

Co-authored-by: Bert <[email protected]>

Author: dnwiebe

masq/src/commands/commands_common.rs

@@ -33,7 +33,17 @@ impl Display for CommandError {
             Transmission(s) => format!("Transmission problem: {}", s),
             Reception(s) => format!("Reception problem: {}", s),
             UnexpectedResponse(e) => format!("{}", e),
-            Payload(code, s) => format!("{} (Code {})", s, code),
+            Payload(code, s) => {
+                let pure_hex_string = format!("{:016X}", code);
+                let expanded_hex_string = format!(
+                    "{}_{}_{}_{}",
+                    &pure_hex_string[0..4],
+                    &pure_hex_string[4..8],
+                    &pure_hex_string[8..12],
+                    &pure_hex_string[12..16]
+                );
+                format!("{} (Code {})", s, expanded_hex_string)
+            }
             Other(s) => s.to_string(),
         };
         write!(f, "{}", msg)
@@ -244,7 +254,7 @@ mod tests {
         );
         assert_eq!(
             format!("{}", Payload(1234, "string".to_string())),
-            "string (Code 1234)".to_string()
+            "string (Code 0000_0000_0000_04D2)".to_string()
         );
         assert_eq!(
             format!("{}", Other("string".to_string())),

masq/tests/startup_shutdown_tests_integration.rs

@@ -96,7 +96,8 @@ fn masq_terminates_based_on_loss_of_connection_to_the_daemon_integration() {
 #[test]
 fn handles_startup_and_shutdown_integration() {
     if cfg!(windows) && is_running_under_github_actions() {
-        eprintln!("This test is not run in Actions under Windows, because it's flaky there.")
+        eprintln!("This test is not run in Actions under Windows, because it's flaky there.");
+        return;
     }
     let dir_path = ensure_node_home_directory_exists(
         "masq_integration_tests",