clippy

Author: liamaharon

node/src/command.rs

@@ -273,7 +273,7 @@ fn start_babe_service(arg_matches: &ArgMatches) -> Result<(), sc_cli::Error> {
                 return start_babe_service(arg_matches);
             // Unknown error, return it.
             } else {
-                log::error!("Failed to start Babe service: {:?}", e);
+                log::error!("Failed to start Babe service: {e:?}");
                 Err(e.into())
             }
         }

node/src/consensus/aura_wrapped_import_queue.rs

@@ -126,14 +126,14 @@ where
         let parent_header = self
             .client
             .header(*first_babe_block_header.parent_hash())
-            .map_err(|e| format!("Failed to get parent header: {}", e))?
+            .map_err(|e| format!("Failed to get parent header: {e}"))?
             .ok_or("Parent header not found".to_string())?;
         let grandparent_hash = parent_header.parent_hash();
 
         let runtime_api = self.client.runtime_api();
         let authorities = runtime_api
             .authorities(*grandparent_hash)
-            .map_err(|e| format!("Failed to get Aura authorities: {}", e))?;
+            .map_err(|e| format!("Failed to get Aura authorities: {e}"))?;
 
         Ok(authorities)
     }

node/src/service.rs

@@ -790,13 +790,13 @@ fn copy_keys(
     let to_keys: HashSet<_> = keystore.raw_public_keys(to_key_type)?.into_iter().collect();
     let to_copy: Vec<_> = from_keys.difference(&to_keys).collect();
 
-    log::debug!(target: LOG_TARGET, "from_keys: {:?}", from_keys);
-    log::debug!(target: LOG_TARGET, "to_keys: {:?}", to_keys);
+    log::debug!(target: LOG_TARGET, "from_keys: {from_keys:?}");
+    log::debug!(target: LOG_TARGET, "to_keys: {to_keys:?}");
     log::debug!(target: LOG_TARGET, "to_copy: {:?} from {:?} to {:?}", &to_copy, from_key_type, to_key_type);
 
     for public in to_copy {
-        if let Some(phrase) = keystore.key_phrase_by_type(&public, from_key_type)? {
-            if let Err(_) = keystore.insert(to_key_type, &phrase, &public) {
+        if let Some(phrase) = keystore.key_phrase_by_type(public, from_key_type)? {
+            if keystore.insert(to_key_type, &phrase, public).is_err() {
                 log::error!(
                     target: LOG_TARGET,
                     "Failed to copy key {:?} into keystore, insert operation failed.",
@@ -806,9 +806,7 @@ fn copy_keys(
         } else {
             log::error!(
                 target: LOG_TARGET,
-                "Failed to copy key from {:?} to {:?} as the key phrase is not available",
-                from_key_type,
-                to_key_type
+                "Failed to copy key from {from_key_type:?} to {to_key_type:?} as the key phrase is not available"
             );
         }
     }