Fixed 'mithril-signer' clippy warnings from Rust 1.67.0

Author: jpraynaud

mithril-signer/src/certificate_handler.rs

@@ -107,8 +107,7 @@ impl CertificateHandlerHTTPClient {
             ))
         } else {
             CertificateHandlerError::ApiVersionMismatch(format!(
-                "version precondition failed, sent version '{}'.",
-                MITHRIL_API_VERSION
+                "version precondition failed, sent version '{MITHRIL_API_VERSION}'."
             ))
         }
     }

mithril-signer/src/main.rs

@@ -91,17 +91,17 @@ async fn main() -> Result<(), Box<dyn Error>> {
         )
         .add_source(config::Environment::default())
         .build()
-        .map_err(|e| format!("configuration build error: {}", e))?
+        .map_err(|e| format!("configuration build error: {e}"))?
         .try_deserialize()
-        .map_err(|e| format!("configuration deserialize error: {}", e))?;
+        .map_err(|e| format!("configuration deserialize error: {e}"))?;
     let services = ProductionServiceBuilder::new(&config).build().await?;
     DatabaseVersionChecker::new(
         slog_scope::logger(),
         ApplicationNodeType::Signer,
         config.get_sqlite_file(),
     )
     .apply()?;
-    debug!("Started"; "run_mode" => &args.run_mode, "config" => format!("{:?}", config));
+    debug!("Started"; "run_mode" => &args.run_mode, "config" => format!("{config:?}"));
 
     let mut state_machine = StateMachine::new(
         SignerState::Unregistered(None),

mithril-signer/src/runtime/runner.rs

@@ -173,8 +173,7 @@ impl Runner for SignerRunner {
             .await?
             .ok_or_else(|| {
                 RuntimeError::NoValueError(format!(
-                    "stakes at epoch {}",
-                    epoch_offset_to_recording_epoch
+                    "stakes at epoch {epoch_offset_to_recording_epoch}"
                 ))
             })?;
         let stake = stake_distribution
@@ -314,7 +313,7 @@ impl Runner for SignerRunner {
             .stake_store
             .get_stakes(epoch)
             .await?
-            .ok_or_else(|| RuntimeError::NoValueError(format!("stakes at epoch {}", epoch)))?;
+            .ok_or_else(|| RuntimeError::NoValueError(format!("stakes at epoch {epoch}")))?;
         let mut signers_with_stake = vec![];
 
         for signer in signers {
@@ -361,8 +360,7 @@ impl Runner for SignerRunner {
             .await?
             .ok_or_else(|| {
                 RuntimeError::NoValueError(format!(
-                    "protocol_initializer at epoch {}",
-                    next_signer_retrieval_epoch
+                    "protocol_initializer at epoch {next_signer_retrieval_epoch}"
                 ))
             })?;
 
@@ -392,8 +390,7 @@ impl Runner for SignerRunner {
             .await?
             .ok_or_else(|| {
                 RuntimeError::NoValueError(format!(
-                    "protocol_initializer at epoch {}",
-                    signer_retrieval_epoch
+                    "protocol_initializer at epoch {signer_retrieval_epoch}"
                 ))
             })?;
         let signature = self.services.single_signer.compute_single_signatures(

mithril-signer/src/runtime/signer_services.rs

@@ -54,12 +54,9 @@ impl<'a> ProductionServiceBuilder<'a> {
         match &self.config.operational_certificate_path {
             Some(operational_certificate_path) => {
                 let opcert: OpCert = OpCert::from_file(operational_certificate_path)
-                    .map_err(|e| format!("Could not decode operational certificate: {:?}", e))?;
+                    .map_err(|e| format!("Could not decode operational certificate: {e:?}"))?;
                 Ok(opcert.compute_protocol_party_id().map_err(|e| {
-                    format!(
-                        "Could not compute party_id from operational certificate: {:?}",
-                        e
-                    )
+                    format!("Could not compute party_id from operational certificate: {e:?}")
                 })?)
             }
             _ => Ok(self
@@ -95,7 +92,7 @@ impl<'a> ServiceBuilder for ProductionServiceBuilder<'a> {
     async fn build(&self) -> Result<SignerServices, Box<dyn StdError>> {
         if !self.config.data_stores_directory.exists() {
             fs::create_dir_all(self.config.data_stores_directory.clone())
-                .map_err(|e| format!("Could not create data stores directory: {:?}", e))?;
+                .map_err(|e| format!("Could not create data stores directory: {e:?}"))?;
         }
 
         let sqlite_db_path = Some(self.config.get_sqlite_file());
@@ -181,10 +178,10 @@ mod tests {
 
         if test_dir.exists() {
             fs::remove_dir_all(&test_dir)
-                .unwrap_or_else(|_| panic!("Could not remove dir {:?}", test_dir));
+                .unwrap_or_else(|_| panic!("Could not remove dir {test_dir:?}"));
         }
         fs::create_dir_all(&test_dir)
-            .unwrap_or_else(|_| panic!("Could not create dir {:?}", test_dir));
+            .unwrap_or_else(|_| panic!("Could not create dir {test_dir:?}"));
 
         test_dir
     }

mithril-signer/src/runtime/state_machine.rs

@@ -56,7 +56,7 @@ impl Display for SignerState {
                 "Unregistered - {}",
                 match state {
                     None => "No Epoch".to_string(),
-                    Some(e) => format!("Epoch({})", e),
+                    Some(e) => format!("Epoch({e})"),
                 }
             ),
             Self::Registered(state) => write!(f, "Registered - {}", state.beacon),

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -240,10 +240,7 @@ impl StateMachineTester {
         let new_immutable = immutable_number + increment;
         self.assert(
             expected == new_immutable,
-            format!(
-                "expected to increase immutable number up to {}, got {}",
-                expected, new_immutable
-            ),
+            format!("expected to increase immutable number up to {expected}, got {new_immutable}"),
         )?;
         self.immutable_observer
             .shall_return(Some(new_immutable))
@@ -262,10 +259,7 @@ impl StateMachineTester {
 
         self.assert(
             expected == new_epoch,
-            format!(
-                "Epoch increased by 1 to {} ({} expected)",
-                new_epoch, expected
-            ),
+            format!("Epoch increased by 1 to {new_epoch} ({expected} expected)"),
         )
     }