Gh 788 multinode test review3

USER-INTERFACE-INTERFACE.md

@@ -612,12 +612,17 @@ desired locations with their priority. The priority provides the node's perspect
 is for our preferences.
 
 This command can be used in two ways which can't be combined:
-1. If we use the command with showCountries set to true, it retrieves information about the available countries in our neighborhood. In this case, other parameters are ignored. 
-2. If we want to set an exit location, we must set showCountries to false and then configure fallbackRouting and exitLocations with our preferences.
+1. If we use the command with showCountries set to true.
+2. If we want to set an exit location.
 
-The fallbackRouting parameter determines whether we want to block exit for a particular country. If this country is no longer 
-available, the route to exit will fail during construction. If fallbackRouting is set to true, we can exit through any available 
-country if none of our specified exitLocations are accessible.
+In case 1. it retrieves information about the available countries in our neighborhood. In this case, other parameters are 
+ignored.
+
+In case 2. we must set showCountries to false and then configure fallbackRouting and exitLocations with our preferences.
+
+The fallbackRouting parameter determines whether we want to block exit for a particular country. If this country is no 
+longer available, the route to exit will fail during construction. If fallbackRouting is set to true, we can exit through 
+any available country if none of our specified exitLocations are accessible.
 
 Priorities are used to determine the preferred exit countries. Priority 1 is the highest, while higher numbers indicate 
 lower priority. For example, if we specify DE with priority 1 and FR with priority 2, then an exit through France will 
@@ -642,14 +647,17 @@ only be used if a German exit is unavailable or significantly more expensive.
 }
 ```
 ##### Description:
-In response, the Node sends a payload to the UI that contains either the Exit Location settings (which may include missing countries) or a list of exit countries.
+In response, the Node sends a payload to the UI that contains either the Exit Location settings (which may include missing 
+countries) or a list of exit countries.
 
 Exit Location settings consist of fallbackRouting, exitCountrySelection, and missingCountries, where:
 1. fallbackRouting is a boolean representing the user's choice to enable or disable fallback routing within the neighborhood. 
 2. exitCountrySelection is an array of objects, where each object represents a set of country codes along with their assigned priority. 
 3. missingCountries is an array of strings representing a list of countries that are currently unavailable in the Node's Neighborhood Database.
 
-Exit Countries (or exitCountries) is an optional array containing ISO country code strings. These represent the countries currently available in the Node's Neighborhood Database. The user can select from these countries to configure the Exit Location settings.
+Exit Countries (or exitCountries) is an optional array containing ISO country code strings. These represent the countries 
+currently available in the Node's Neighborhood Database. The user can select from these countries to configure the Exit 
+Location settings.
 
 #### `financials`
 ##### Direction: Request

masq/src/commands/exit_location_command.rs

@@ -447,7 +447,7 @@ pub mod tests {
  }
 
  #[test]
- fn providing_show_countries_flag_cause_request_for_list_of_countries() {
+ fn providing_show_countries_flag_causes_request_for_list_of_countries() {
  let transact_params_arc = Arc::new(Mutex::new(vec![]));
  let mut context = CommandContextMock::new()
  .transact_params(&transact_params_arc)
@@ -490,10 +490,9 @@ pub mod tests {
  }
 
  #[test]
- fn providing_show_countries_with_other_argument_fails() {
- let result_expected_one = "SetExitLocationCommand error: The argument '--country-codes <COUNTRY-CODES>' cannot be used with one or more of the other specified arguments\n\nUSAGE:\n";
- let result_expected_two = "SetExitLocationCommand error: The argument '--show-countries' cannot be used with one or more of the other specified arguments\n\nUSAGE:\n";
-
+ fn providing_show_countries_with_country_codes_fails() {
+ let result_expected = "cannot be used with one or more of the other specified arguments\n\nUSAGE:\n";
+
  let result = SetExitLocationCommand::new(&[
  "exit-location".to_string(),
  "--show-countries".to_string(),
@@ -503,11 +502,29 @@ pub mod tests {
  .unwrap_err();
 
  assert!(
- result.contains(result_expected_one) || result.contains(result_expected_two),
- "result was {:?}, but expected {:?} or {:?}",
+ result.contains(result_expected),
+ "result was {:?}, but expected {:?}",
+ result,
+ result_expected,
+ );
+ }
+
+ #[test]
+ fn providing_show_countries_with_fallback_routing_fails() {
+ let result_expected = "cannot be used with one or more of the other specified arguments\n\nUSAGE:\n";
+
+ let result = SetExitLocationCommand::new(&[
+ "exit-location".to_string(),
+ "--show-countries".to_string(),
+ "--fallback-routing".to_string(),
+ ])
+ .unwrap_err();
+
+ assert!(
+ result.contains(result_expected),
+ "result was {:?}, but expected {:?}",
  result,
- result_expected_one,
- result_expected_two
+ result_expected,
  );
  }
 }

masq_lib/src/constants.rs

@@ -107,9 +107,6 @@ pub const BASE_MAINNET_FULL_IDENTIFIER: &str = concatcp!(BASE_FAMILY, LINK, MAIN
 pub const BASE_SEPOLIA_FULL_IDENTIFIER: &str = concatcp!(BASE_FAMILY, LINK, "sepolia");
 pub const DEV_CHAIN_FULL_IDENTIFIER: &str = "dev";
 
-//allocations
-pub const DEFAULT_PREALLOCATION_VEC: usize = 10;
-
 #[cfg(test)]
 mod tests {
  use super::*;
@@ -205,7 +202,6 @@ mod tests {
  DataVersion { major: 0, minor: 1 }
  );
  assert_eq!(PAYLOAD_ZERO_SIZE, 0usize);
- assert_eq!(DEFAULT_PREALLOCATION_VEC, 10)
  }
 
  #[test]

masq_lib/src/exit_locations.rs

@@ -19,9 +19,8 @@ impl Display for ExitLocationSet {
  exit_location.country_codes, exit_location.priority
  )
  })
- .collect_vec()
  .join("; ");
- write!(f, "{}", exit_location_string)?;
+ write!(f, "{}", exit_location_string).expect("writing failed");
  Ok(())
  }
 }

masq_lib/src/messages.rs

@@ -852,7 +852,7 @@ conversation_message!(UiWalletAddressesResponse, "walletAddresses");
 // in the future according to future user interface needs of more specification
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 pub struct CountryGroups {
- #[serde(rename = "CountryGroups")]
+ #[serde(rename = "countryCodes")]
  pub country_codes: Vec<String>,
  pub priority: usize,
 }
@@ -883,7 +883,7 @@ conversation_message!(UiSetExitLocationRequest, "exitLocation");
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
 pub struct ExitLocation {
- #[serde(rename = "CountryGroups")]
+ #[serde(rename = "countryCodes")]
  pub country_codes: Vec<String>,
  pub priority: usize,
 }

multinode_integration_tests/src/masq_node.rs

@@ -304,8 +304,8 @@ impl MASQNodeUtils {
  }
 
  pub fn derive_country_code_opt(node_addr: &NodeAddr) -> Option<String> {
- let country_code = get_node_location(Some(node_addr.ip_addr()));
- if let Some(cc) = country_code {
+ let country_code_opt = get_node_location(Some(node_addr.ip_addr()));
+ if let Some(cc) = country_code_opt {
  Some(cc.country_code)
  } else {
  None

node/src/neighborhood/gossip_acceptor.rs

@@ -93,8 +93,8 @@ impl GossipHandler for DebutHandler {
  if database.node_by_key(&agrs[0].inner.public_key).is_some() {
  return Qualification::Unmatched;
  }
- //TODO create optimization card: drive in the test and following commented out code,
- // TODO: Imagine a brand-new network, consisting only of Node A.
+ //TODO: Create optimization card to drive in the following logic:
+ // Imagine a brand-new network, consisting only of Node A.
  // When Node B debuts, Node A cannot respond with an Introduction,
  // since there's nobody to introduce. Therefore, Node A must
  // respond with a single-Node Gossip that will currently be
@@ -1750,24 +1750,16 @@ mod tests {
  )
  .unwrap();
 
- let (debut_reply, dest_public_key, dest_node_addr) = match counter_debut {
+ let (dest_public_key, dest_node_addr) = match counter_debut {
  GossipAcceptanceResult::Reply(
-ref debut_reply,
+_,
  ref dest_public_key,
  ref dest_node_addr,
- ) => (debut_reply, dest_public_key, dest_node_addr),
+ ) => (dest_public_key, dest_node_addr),
  x => panic!("Expected Reply, got {:?}", x),
  };
  assert_eq!(dest_public_key, new_debutant.public_key());
  assert_eq!(dest_node_addr, &new_debutant.node_addr_opt().unwrap());
- assert_eq!(
- counter_debut,
- GossipAcceptanceResult::Reply(
- debut_reply.clone(),
- dest_public_key.clone(),
- dest_node_addr.clone()
- )
- )
  }
 
  #[test]