MASQ-Project
diff --git a/‎multinode_integration_tests/src/masq_mock_node.rs‎
Lines changed: 29 additions & 1 deletion b/‎multinode_integration_tests/src/masq_mock_node.rs‎
Lines changed: 29 additions & 1 deletion
diff --git a/‎multinode_integration_tests/src/neighborhood_constructor.rs‎
Lines changed: 20 additions & 13 deletions b/‎multinode_integration_tests/src/neighborhood_constructor.rs‎
Lines changed: 20 additions & 13 deletions
@@ -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) {
 
@@ -3,8 +3,8 @@
 use crate::masq_mock_node::MASQMockNode;
 use crate::masq_node::MASQNode;
 use crate::masq_node_cluster::MASQNodeCluster;
-use crate::masq_real_node::MASQRealNode;
 use crate::masq_real_node::{make_consuming_wallet_info, NodeStartupConfigBuilder};
+use crate::masq_real_node::{MASQRealNode, NodeStartupConfig};
 use crate::multinode_gossip::{Standard, StandardBuilder};
 use node_lib::neighborhood::gossip::Gossip_0v1;
 use node_lib::neighborhood::gossip_producer::{GossipProducer, GossipProducerReal};
@@ -51,25 +51,28 @@ use std::time::Duration;
 /// * `HashMap<PublicKey, MASQMockNode>` The mock Nodes corresponding to other NodeRecords in `model_db`. They
 ///                                             will have the same public keys as the `model_db` NodeRecords they
 ///                                             represent, but different NodeAddrs.
-pub fn construct_neighborhood(
+pub fn construct_neighborhood<F>(
     cluster: &mut MASQNodeCluster,
     model_db: NeighborhoodDatabase,
     additional_keys_to_mock: Vec<&PublicKey>,
+    modify_config: F,
 ) -> (
     NeighborhoodDatabase,
     MASQRealNode,
     HashMap<PublicKey, MASQMockNode>,
-) {
-    let real_node = cluster.start_real_node(
-        NodeStartupConfigBuilder::standard()
-            .fake_public_key(model_db.root().public_key())
-            .consuming_wallet_info(make_consuming_wallet_info(
-                model_db.root().public_key().to_string().as_str(),
-            ))
-            .rate_pack(model_db.root().inner.rate_pack)
-            .chain(cluster.chain)
-            .build(),
-    );
+)
+where
+    F: FnOnce(NodeStartupConfigBuilder) -> NodeStartupConfig,
+{
+    let config_builder = NodeStartupConfigBuilder::standard()
+        .fake_public_key(model_db.root().public_key())
+        .consuming_wallet_info(make_consuming_wallet_info(
+            model_db.root().public_key().to_string().as_str(),
+        ))
+        .rate_pack(model_db.root().inner.rate_pack)
+        .chain(cluster.chain);
+    let config = modify_config(config_builder);
+    let real_node = cluster.start_real_node(config);
     let (mock_node_map, adjacent_mock_node_keys) =
         make_mock_node_map(cluster, &model_db, &real_node, additional_keys_to_mock);
     let modified_nodes = make_modified_node_records(model_db, &mock_node_map);
@@ -82,6 +85,10 @@ pub fn construct_neighborhood(
     (modified_db, real_node, mock_node_map)
 }
 
+pub fn do_not_modify_config() -> impl FnOnce(NodeStartupConfigBuilder) -> NodeStartupConfig {
+    |builder: NodeStartupConfigBuilder| builder.build()
+}
+
 fn make_mock_node_map(
     cluster: &mut MASQNodeCluster,
     model_db: &NeighborhoodDatabase,