GH-651: Automatic Retries for the URLs in case of DNS Resolve Failure

multinode_integration_tests/src/masq_mock_node.rs

@@ -19,7 +19,9 @@ use node_lib::sub_lib::cryptde::{encodex, CryptDE};
 use node_lib::sub_lib::cryptde_null::CryptDENull;
 use node_lib::sub_lib::cryptde_real::CryptDEReal;
 use node_lib::sub_lib::framer::Framer;
-use node_lib::sub_lib::hopper::{IncipientCoresPackage, MessageType};
+use node_lib::sub_lib::hopper::{
+    ExpiredCoresPackage, IncipientCoresPackage, MessageType, MessageTypeLite,
+};
 use node_lib::sub_lib::neighborhood::{GossipFailure_0v1, RatePack, DEFAULT_RATE_PACK};
 use node_lib::sub_lib::node_addr::NodeAddr;
 use node_lib::sub_lib::route::Route;
@@ -394,6 +396,32 @@ impl MASQMockNode {
         Ok((socket_from, socket_to, live_cores_package))
     }
 
+    pub fn wait_for_specific_package(
+        &self,
+        message_type_lite: MessageTypeLite,
+        immediate_neighbor: SocketAddr,
+    ) -> Option<ExpiredCoresPackage<MessageType>> {
+        let public_key = self.main_public_key();
+        let cryptde = CryptDENull::from(public_key, TEST_DEFAULT_MULTINODE_CHAIN);
+        loop {
+            if let Ok((_, _, live_cores_package)) =
+                self.wait_for_package(&JsonMasquerader::new(), Duration::from_secs(2))
+            {
+                let (_, intended_exit_public_key) =
+                    CryptDENull::extract_key_pair(public_key.len(), &live_cores_package.payload);
+                assert_eq!(&intended_exit_public_key, public_key);
+                let expired_cores_package = live_cores_package
+                    .to_expired(immediate_neighbor, &cryptde, &cryptde)
+                    .unwrap();
+                if message_type_lite == expired_cores_package.payload.clone().into() {
+                    return Some(expired_cores_package);
+                }
+            } else {
+                return None;
+            }
+        }
+    }
+
     pub fn wait_for_gossip(&self, timeout: Duration) -> Option<(Gossip_0v1, IpAddr)> {
         let masquerader = JsonMasquerader::new();
         match self.wait_for_package(&masquerader, timeout) {

multinode_integration_tests/src/neighborhood_constructor.rs

@@ -12,6 +12,7 @@ use node_lib::neighborhood::neighborhood_database::NeighborhoodDatabase;
 use node_lib::neighborhood::node_record::{NodeRecord, NodeRecordMetadata};
 use node_lib::neighborhood::AccessibleGossipRecord;
 use node_lib::sub_lib::cryptde::PublicKey;
+use node_lib::sub_lib::neighborhood::Hops;
 use node_lib::sub_lib::utils::time_t_timestamp;
 use node_lib::test_utils::neighborhood_test_utils::db_from_node;
 use std::collections::{BTreeSet, HashMap};
@@ -55,6 +56,7 @@ pub fn construct_neighborhood(
     cluster: &mut MASQNodeCluster,
     model_db: NeighborhoodDatabase,
     additional_keys_to_mock: Vec<&PublicKey>,
+    min_hops: Hops,
 ) -> (
     NeighborhoodDatabase,
     MASQRealNode,
@@ -66,6 +68,7 @@ pub fn construct_neighborhood(
             .consuming_wallet_info(make_consuming_wallet_info(
                 model_db.root().public_key().to_string().as_str(),
             ))
+            .min_hops(min_hops)
             .rate_pack(model_db.root().inner.rate_pack)
             .chain(cluster.chain)
             .build(),