GH-728: send a ConfigurtionChangeMessage when the consuming wallet is…

… generated
MASQ-Project · Jan 23, 2024 · 3ec34fe · 3ec34fe
1 parent 6a8086e
commit 3ec34fe
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 149 deletions.
diff --git a/node/src/accountant/mod.rs b/node/src/accountant/mod.rs
@@ -1025,7 +1025,6 @@ mod tests {
         DEFAULT_EARNING_WALLET, DEFAULT_PAYMENT_THRESHOLDS,
     };
     use crate::sub_lib::blockchain_bridge::OutboundPaymentsInstructions;
-    use crate::sub_lib::neighborhood::ConfigurationChange::UpdatePassword;
     use crate::test_utils::persistent_configuration_mock::PersistentConfigurationMock;
     use crate::test_utils::recorder::make_recorder;
     use crate::test_utils::recorder::peer_actors_builder;
@@ -1207,24 +1206,25 @@ mod tests {
 
     #[test]
     fn accountant_updates_password_when_it_receives_configuration_change_msg() {
-        let system =
-            System::new("accountant_updates_password_when_it_receives_configuration_change_msg");
-        let mut config = bc_from_earning_wallet(make_wallet("earning_wallet"));
-        let subject = AccountantBuilder::default()
-            .bootstrapper_config(config)
-            .build();
-        let subject_addr = subject.start();
-        let peer_actors = peer_actors_builder().build();
-        subject_addr.try_send(BindMessage { peer_actors }).unwrap();
-
-        subject_addr
-            .try_send(ConfigurationChangeMessage {
-                change: UpdatePassword("new_password".to_string()),
-            })
-            .unwrap();
-
-        System::current().stop();
-        assert_eq!(system.run(), 0);
+        todo!("either remove this test or modify it");
+        // let system =
+        //     System::new("accountant_updates_password_when_it_receives_configuration_change_msg");
+        // let mut config = bc_from_earning_wallet(make_wallet("earning_wallet"));
+        // let subject = AccountantBuilder::default()
+        //     .bootstrapper_config(config)
+        //     .build();
+        // let subject_addr = subject.start();
+        // let peer_actors = peer_actors_builder().build();
+        // subject_addr.try_send(BindMessage { peer_actors }).unwrap();
+        //
+        // subject_addr
+        //     .try_send(ConfigurationChangeMessage {
+        //         change: UpdatePassword("new_password".to_string()),
+        //     })
+        //     .unwrap();
+        //
+        // System::current().stop();
+        // assert_eq!(system.run(), 0);
     }
 
     #[test]

diff --git a/node/src/actor_system_factory.rs b/node/src/actor_system_factory.rs
@@ -25,7 +25,7 @@ use crate::sub_lib::dispatcher::DispatcherSubs;
 use crate::sub_lib::hopper::HopperConfig;
 use crate::sub_lib::hopper::HopperSubs;
 use crate::sub_lib::neighborhood::{
-    ConfigurationChangeMessage, NeighborhoodMode, NeighborhoodSubs,
+     NeighborhoodMode, NeighborhoodSubs,
 };
 use crate::sub_lib::peer_actors::{BindMessage, StartMessage};
 use crate::sub_lib::peer_actors::{NewPublicIp, PeerActors};
@@ -536,7 +536,6 @@ impl ActorFactory for ActorFactoryReal {
         ConfiguratorSubs {
             bind: recipient!(addr, BindMessage),
             node_from_ui_sub: recipient!(addr, NodeFromUiMessage),
-            configuration_change_msg_sub: recipient!(addr, ConfigurationChangeMessage),
         }
     }
 }

diff --git a/node/src/blockchain/blockchain_bridge.rs b/node/src/blockchain/blockchain_bridge.rs
@@ -555,7 +555,6 @@ mod tests {
     use crate::db_config::persistent_configuration::PersistentConfigError;
     use crate::match_every_type_id;
     use crate::node_test_utils::check_timestamp;
-    use crate::sub_lib::neighborhood::ConfigurationChange::UpdatePassword;
     use crate::test_utils::persistent_configuration_mock::PersistentConfigurationMock;
     use crate::test_utils::recorder::{make_recorder, peer_actors_builder};
     use crate::test_utils::recorder_stop_conditions::StopCondition;
@@ -667,27 +666,28 @@ mod tests {
 
     #[test]
     fn blockchain_bridge_updates_password_when_it_receives_configuration_change_msg() {
-        let system = System::new(
-            "blockchain_bridge_updates_password_when_it_receives_configuration_change_msg",
-        );
-        let subject = BlockchainBridge::new(
-            stub_bi(),
-            Box::new(PersistentConfigurationMock::default()),
-            false,
-            None,
-        );
-        let subject_addr = subject.start();
-        let peer_actors = peer_actors_builder().build();
-        subject_addr.try_send(BindMessage { peer_actors }).unwrap();
-
-        subject_addr
-            .try_send(ConfigurationChangeMessage {
-                change: UpdatePassword("new_password".to_string()),
-            })
-            .unwrap();
-
-        System::current().stop();
-        assert_eq!(system.run(), 0);
+        todo!("remove this test");
+        // let system = System::new(
+        //     "blockchain_bridge_updates_password_when_it_receives_configuration_change_msg",
+        // );
+        // let subject = BlockchainBridge::new(
+        //     stub_bi(),
+        //     Box::new(PersistentConfigurationMock::default()),
+        //     false,
+        //     None,
+        // );
+        // let subject_addr = subject.start();
+        // let peer_actors = peer_actors_builder().build();
+        // subject_addr.try_send(BindMessage { peer_actors }).unwrap();
+        //
+        // subject_addr
+        //     .try_send(ConfigurationChangeMessage {
+        //         change: UpdatePassword("new_password".to_string()),
+        //     })
+        //     .unwrap();
+        //
+        // System::current().stop();
+        // assert_eq!(system.run(), 0);
     }
 
     #[test]

diff --git a/node/src/neighborhood/mod.rs b/node/src/neighborhood/mod.rs
@@ -165,9 +165,6 @@ impl Handler<ConfigurationChangeMessage> for Neighborhood {
                 }
                 self.search_for_a_new_route();
             }
-            ConfigurationChange::UpdatePassword(new_password) => {
-                self.handle_new_password(new_password);
-            }
         }
     }
 }
@@ -1705,7 +1702,6 @@ mod tests {
     use crate::neighborhood::overall_connection_status::{
         ConnectionProgress, ConnectionStage, OverallConnectionStage,
     };
-    use crate::sub_lib::neighborhood::ConfigurationChange::UpdatePassword;
     use crate::test_utils::unshared_test_utils::notify_handlers::NotifyLaterHandleMock;
     use masq_lib::test_utils::logging::{init_test_logging, TestLogHandler};
 
@@ -5865,28 +5861,29 @@ mod tests {
 
     #[test]
     fn password_can_be_updated_using_configuration_change_msg() {
-        let system = System::new("password_can_be_updated_using_configuration_change_msg");
-        let mut subject = make_standard_subject();
-        subject.db_password_opt = Some("old_password".to_string());
-        let subject_addr = subject.start();
-        let peer_actors = peer_actors_builder().build();
-        subject_addr.try_send(BindMessage { peer_actors }).unwrap();
-
-        subject_addr
-            .try_send(ConfigurationChangeMessage {
-                change: UpdatePassword("new_password".to_string()),
-            })
-            .unwrap();
-
-        subject_addr
-            .try_send(AssertionsMessage {
-                assertions: Box::new(|subject: &mut Neighborhood| {
-                    assert_eq!(subject.db_password_opt, Some("new_password".to_string()))
-                }),
-            })
-            .unwrap();
-        System::current().stop();
-        assert_eq!(system.run(), 0);
+        todo!("modify this test to update the consuming wallet instead");
+        // let system = System::new("password_can_be_updated_using_configuration_change_msg");
+        // let mut subject = make_standard_subject();
+        // subject.db_password_opt = Some("old_password".to_string());
+        // let subject_addr = subject.start();
+        // let peer_actors = peer_actors_builder().build();
+        // subject_addr.try_send(BindMessage { peer_actors }).unwrap();
+        //
+        // subject_addr
+        //     .try_send(ConfigurationChangeMessage {
+        //         change: UpdatePassword("new_password".to_string()),
+        //     })
+        //     .unwrap();
+        //
+        // subject_addr
+        //     .try_send(AssertionsMessage {
+        //         assertions: Box::new(|subject: &mut Neighborhood| {
+        //             assert_eq!(subject.db_password_opt, Some("new_password".to_string()))
+        //         }),
+        //     })
+        //     .unwrap();
+        // System::current().stop();
+        // assert_eq!(system.run(), 0);
     }
 
     #[test]