merge conflicts

applications/tari_console_wallet/src/init/mod.rs

@@ -134,7 +134,7 @@ pub async fn change_password(
     shutdown_signal: ShutdownSignal,
 ) -> Result<(), ExitCodes>
 {
-    let mut wallet = init_wallet(config, node_identity, arg_password, None, shutdown_signal).await?;
+    let mut wallet = init_wallet(config, arg_password, None, shutdown_signal).await?;
 
     let passphrase = prompt_password("New wallet password: ")?;
     let confirmed = prompt_password("Confirm new password: ")?;

applications/tari_console_wallet/src/main.rs

@@ -68,10 +68,6 @@ fn main_inner() -> Result<(), ExitCodes> {
         None
     };
 
-    let id_exists = config.console_wallet_identity_file.exists();
-    let create_id = !id_exists || bootstrap.create_id;
-
-
     if bootstrap.init {
         info!(target: LOG_TARGET, "Default configuration created. Done.");
     }
@@ -88,12 +84,7 @@ fn main_inner() -> Result<(), ExitCodes> {
     }
 
     // initialize wallet
-    let mut wallet = runtime.block_on(init_wallet(
-        &config,
-        arg_password,
-        master_key,
-        shutdown_signal,
-    ))?;
+    let mut wallet = runtime.block_on(init_wallet(&config, arg_password, master_key, shutdown_signal))?;
 
     // get base node/s
     let base_node_config = runtime.block_on(get_base_node_peer_config(&config, &mut wallet))?;

base_layer/wallet/src/transaction_service/protocols/transaction_broadcast_protocol.rs

@@ -118,7 +118,7 @@ where TBackend: TransactionBackend + 'static
             futures::select! {
                 dial_result = self.resources.connectivity_manager.dial_peer(base_node_node_id.clone()).fuse() => {
                     match dial_result {
-                        Ok(mut base_node_connection) => {
+                        Ok( base_node_connection) => {
                             connection = Some(base_node_connection);
                         },
                         Err(e) => {