Merge pull request #889 from TheCharlatan/swapKeyManagerMut

Swapd: Only make accesses to swap key manager mut that need to be

Author: sedited

src/swapd/swap_key_manager.rs

@@ -255,7 +255,7 @@ impl AliceSwapKeyManager {
     }
 
     pub fn taker_commit(
-        &mut self,
+        &self,
         event: &mut Event,
         runtime: &mut Runtime,
     ) -> Result<CommitAliceParameters, Error> {
@@ -303,7 +303,7 @@ impl AliceSwapKeyManager {
     }
 
     pub fn maker_commit(
-        &mut self,
+        &self,
         event: &mut Event,
         runtime: &mut Runtime,
     ) -> Result<CommitAliceParameters, Error> {
@@ -372,10 +372,7 @@ impl AliceSwapKeyManager {
         // Nothing to do yet, waiting for Msg CoreArbitratingSetup to proceed
     }
 
-    pub fn create_reveal_from_local_params(
-        &mut self,
-        runtime: &mut Runtime,
-    ) -> Result<Reveal, Error> {
+    pub fn create_reveal_from_local_params(&self, runtime: &mut Runtime) -> Result<Reveal, Error> {
         let AliceSwapKeyManager { local_params, .. } = self;
         runtime.log_debug("Generating reveal alice message");
         Ok(Reveal::Alice {
@@ -681,7 +678,7 @@ impl BobSwapKeyManager {
     }
 
     pub fn taker_commit(
-        &mut self,
+        &self,
         event: &mut Event,
         runtime: &mut Runtime,
     ) -> Result<CommitBobParameters, Error> {
@@ -746,7 +743,7 @@ impl BobSwapKeyManager {
     }
 
     pub fn maker_commit(
-        &mut self,
+        &self,
         event: &mut Event,
         runtime: &mut Runtime,
     ) -> Result<CommitBobParameters, Error> {
@@ -769,10 +766,7 @@ impl BobSwapKeyManager {
         Ok(local_params.commit_bob(runtime.swap_id, &engine))
     }
 
-    pub fn create_reveal_from_local_params(
-        &mut self,
-        runtime: &mut Runtime,
-    ) -> Result<Reveal, Error> {
+    pub fn create_reveal_from_local_params(&self, runtime: &mut Runtime) -> Result<Reveal, Error> {
         let BobSwapKeyManager { local_params, .. } = self;
         // craft the correct reveal depending on role
         Ok(Reveal::Bob {

src/swapd/swap_state.rs

@@ -633,7 +633,7 @@ fn attempt_transition_to_init_taker(
 
             match swap_role {
                 SwapRole::Bob => {
-                    let mut swap_key_manager = BobSwapKeyManager::new_taker_bob(
+                    let swap_key_manager = BobSwapKeyManager::new_taker_bob(
                         &mut event,
                         runtime,
                         target_bitcoin_address.clone(),
@@ -665,7 +665,7 @@ fn attempt_transition_to_init_taker(
                     })))
                 }
                 SwapRole::Alice => {
-                    let mut swap_key_manager = AliceSwapKeyManager::new_taker_alice(
+                    let swap_key_manager = AliceSwapKeyManager::new_taker_alice(
                         runtime,
                         target_bitcoin_address.clone(),
                         target_monero_address,
@@ -741,7 +741,7 @@ fn attempt_transition_to_init_maker(
                             "Local swap role is Bob, but received Bob remote commit".to_string(),
                         ));
                     };
-                    let mut swap_key_manager = BobSwapKeyManager::new_maker_bob(
+                    let swap_key_manager = BobSwapKeyManager::new_maker_bob(
                         &mut event,
                         runtime,
                         target_bitcoin_address,
@@ -781,7 +781,7 @@ fn attempt_transition_to_init_maker(
                             "Local swap role is Bob, but received Bob remote commit".to_string(),
                         ));
                     };
-                    let mut swap_key_manager = AliceSwapKeyManager::new_maker_alice(
+                    let swap_key_manager = AliceSwapKeyManager::new_maker_alice(
                         runtime,
                         target_bitcoin_address,
                         target_monero_address,
@@ -823,9 +823,7 @@ fn try_bob_init_taker_to_bob_taker_maker_commit(
     runtime: &mut Runtime,
     bob_init_taker: BobInitTaker,
 ) -> Result<Option<SwapStateMachine>, Error> {
-    let BobInitTaker {
-        mut swap_key_manager,
-    } = bob_init_taker;
+    let BobInitTaker { swap_key_manager } = bob_init_taker;
     match event.request.clone() {
         BusMsg::P2p(PeerMsg::DealNotFound(_)) => {
             runtime.log_error(format!(
@@ -856,11 +854,9 @@ fn try_bob_init_taker_to_bob_taker_maker_commit(
 fn try_alice_init_taker_to_alice_taker_maker_commit(
     event: Event,
     runtime: &mut Runtime,
-    bob_init_taker: AliceInitTaker,
+    alice_init_taker: AliceInitTaker,
 ) -> Result<Option<SwapStateMachine>, Error> {
-    let AliceInitTaker {
-        mut swap_key_manager,
-    } = bob_init_taker;
+    let AliceInitTaker { swap_key_manager } = alice_init_taker;
     match event.request {
         BusMsg::P2p(PeerMsg::DealNotFound(_)) => {
             runtime.log_error(format!(