Gh 468 #545 - actions run

.github/workflows/ci-matrix.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
     branches:
-      - master
+      - GH-784
 
 jobs:
   build:

ci/all.sh

@@ -8,7 +8,7 @@ ci/format.sh
 export RUST_BACKTRACE=1
 
 # Remove these two lines to slow down the build
-which sccache || cargo install sccache || echo "Skipping sccache installation"  # Should do significant work only once
+which sccache || cargo install --version 0.4.1 sccache || echo "Skipping sccache installation"  # Should do significant work only once
 #export CARGO_TARGET_DIR="$CI_DIR/../cargo-cache"
 export SCCACHE_DIR="$HOME/.cargo/sccache"
 #export RUSTC_WRAPPER="$HOME/.cargo/bin/sccache"

ip_country/Cargo.toml

@@ -13,8 +13,9 @@ workspace = "../node"
 csv = "1.3.0"
 itertools = "0.13.0"
 lazy_static = "1.4.0"
-masq_lib = { path = "../masq_lib" }
 
+[dev-dependencies]
+test_utilities = { path = "../test_utilities"}
 
 [[bin]]
 name = "ip_country"

ip_country/src/country_finder.rs

@@ -54,9 +54,7 @@ impl CountryCodeFinder {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::country_block_serde::{
-        CountryBlockDeserializer, Ipv4CountryBlockDeserializer, Ipv6CountryBlockDeserializer,
-    };
+    use crate::country_block_serde::{Ipv4CountryBlockDeserializer, Ipv6CountryBlockDeserializer};
     use crate::dbip_country;
     use std::str::FromStr;
     use std::time::SystemTime;

ip_country/src/ip_country.rs

@@ -133,8 +133,8 @@ fn write_value(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use masq_lib::test_utils::fake_stream_holder::{ByteArrayReader, ByteArrayWriter};
     use std::io::{Error, ErrorKind};
+    use test_utilities::byte_array_reader_writer::{ByteArrayReader, ByteArrayWriter};
 
     static PROPER_TEST_DATA: &str = "0.0.0.0,0.255.255.255,ZZ
 1.0.0.0,1.0.0.255,AU

masq/Cargo.toml

@@ -28,6 +28,7 @@ nix = "0.23.0"
 
 [dev-dependencies]
 atty = "0.2.14"
+test_utilities = { path = "../test_utilities" }
 
 [lib]
 name = "masq_cli_lib"

masq/src/command_context.rs

@@ -156,12 +156,12 @@ mod tests {
     use crate::test_utils::mocks::TRANSACT_TIMEOUT_MILLIS_FOR_TESTS;
     use masq_lib::messages::{FromMessageBody, UiCrashRequest, UiSetupRequest};
     use masq_lib::messages::{ToMessageBody, UiShutdownRequest, UiShutdownResponse};
-    use masq_lib::test_utils::fake_stream_holder::{ByteArrayReader, ByteArrayWriter};
     use masq_lib::test_utils::mock_websockets_server::MockWebSocketsServer;
     use masq_lib::ui_gateway::MessageBody;
     use masq_lib::ui_gateway::MessagePath::Conversation;
     use masq_lib::ui_traffic_converter::{TrafficConversionError, UnmarshalError};
     use masq_lib::utils::{find_free_port, running_test};
+    use test_utilities::byte_array_reader_writer::{ByteArrayReader, ByteArrayWriter};
 
     #[test]
     fn constant_has_correct_values() {

masq/src/command_factory.rs

@@ -8,6 +8,7 @@ use crate::commands::configuration_command::ConfigurationCommand;
 use crate::commands::connection_status_command::ConnectionStatusCommand;
 use crate::commands::crash_command::CrashCommand;
 use crate::commands::descriptor_command::DescriptorCommand;
+use crate::commands::exit_location_command::SetExitLocationCommand;
 use crate::commands::financials_command::FinancialsCommand;
 use crate::commands::generate_wallets_command::GenerateWalletsCommand;
 use crate::commands::recover_wallets_command::RecoverWalletsCommand;
@@ -52,6 +53,10 @@ impl CommandFactory for CommandFactoryReal {
                 Err(msg) => return Err(CommandSyntax(msg)),
             },
             "descriptor" => Box::new(DescriptorCommand::new()),
+            "exit-location" => match SetExitLocationCommand::new(pieces) {
+                Ok(command) => Box::new(command),
+                Err(msg) => return Err(CommandSyntax(msg)),
+            },
             "financials" => match FinancialsCommand::new(pieces) {
                 Ok(command) => Box::new(command),
                 Err(msg) => return Err(CommandSyntax(msg)),
@@ -103,6 +108,7 @@ impl CommandFactoryReal {
 mod tests {
     use super::*;
     use crate::command_factory::CommandFactoryError::UnrecognizedSubcommand;
+    use masq_lib::messages::CountryCodes;
 
     #[test]
     fn complains_about_unrecognized_subcommand() {
@@ -258,6 +264,33 @@ mod tests {
         );
     }
 
+    #[test]
+    fn factory_produces_exit_location() {
+        let subject = CommandFactoryReal::new();
+
+        let command = subject
+            .make(&[
+                "exit-location".to_string(),
+                "--country-codes".to_string(),
+                "CZ".to_string(),
+            ])
+            .unwrap();
+
+        assert_eq!(
+            command
+                .as_any()
+                .downcast_ref::<SetExitLocationCommand>()
+                .unwrap(),
+            &SetExitLocationCommand {
+                exit_locations: vec![CountryCodes {
+                    country_codes: vec!["CZ".to_string()],
+                    priority: 1
+                }],
+                fallback_routing: false,
+            }
+        );
+    }
+
     #[test]
     fn complains_about_set_configuration_command_with_no_parameters() {
         let subject = CommandFactoryReal::new();