fix: clippy warnings

Near-One · Jan 20, 2025 · 05d8205 · 05d8205
1 parent c5ef05b
commit 05d8205
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/bridge-cli/src/main.rs b/bridge-cli/src/main.rs
@@ -309,7 +309,7 @@ enum SubCommand {
     },
 }
 
-#[derive(ValueEnum, Clone, Debug)]
+#[derive(ValueEnum, Copy, Clone, Debug)]
 enum Network {
     Mainnet,
     Testnet,
@@ -331,24 +331,24 @@ async fn main() {
 
     match args.cmd {
         SubCommand::Nep141Connector { cmd } => {
-            nep141_connector_command::match_subcommand(cmd, args.network).await
+            nep141_connector_command::match_subcommand(cmd, args.network).await;
         }
         SubCommand::EthConnector { cmd } => {
-            eth_connector_command::match_subcommand(cmd, args.network).await
+            eth_connector_command::match_subcommand(cmd, args.network).await;
         }
         SubCommand::FastBridge { cmd } => {
-            fast_bridge_command::match_subcommand(cmd, args.network).await
+            fast_bridge_command::match_subcommand(cmd, args.network).await;
         }
         SubCommand::OmniConnector { cmd } => {
-            omni_connector_command::match_subcommand(cmd, args.network).await
+            omni_connector_command::match_subcommand(cmd, args.network).await;
         }
     }
 }
 
 fn init_logger() {
     let field_formatter = format::debug_fn(|writer, field, value| match field.name() {
-        "message" => write!(writer, "{:?}", value),
-        _ => write!(writer, "{}={:?}", field, value),
+        "message" => write!(writer, "{value:?}"),
+        _ => write!(writer, "{field}={value:?}"),
     })
     .display_messages()
     .delimited("\n");

diff --git a/bridge-cli/src/omni_connector_command.rs b/bridge-cli/src/omni_connector_command.rs
@@ -225,6 +225,7 @@ pub enum OmniConnectorSubCommand {
     },
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
     match cmd {
         OmniConnectorSubCommand::LogMetadata { token, config_cli } => {
@@ -392,7 +393,7 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
             config_cli,
         } => {
             omni_connector(network, config_cli)
-                .solana_initialize(extract_solana_keypair(program_keypair))
+                .solana_initialize(extract_solana_keypair(&program_keypair))
                 .await
                 .unwrap();
         }
@@ -534,7 +535,12 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
                 .solana_wormhole_address
                 .map(|addr| addr.parse().unwrap()),
         )
-        .keypair(combined_config.solana_keypair.map(extract_solana_keypair))
+        .keypair(
+            combined_config
+                .solana_keypair
+                .as_deref()
+                .map(extract_solana_keypair),
+        )
         .build()
         .unwrap();
 
@@ -554,10 +560,10 @@ fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
         .unwrap()
 }
 
-fn extract_solana_keypair(keypair: String) -> Keypair {
-    if keypair.contains("/") || keypair.contains(".") {
+fn extract_solana_keypair(keypair: &str) -> Keypair {
+    if keypair.contains('/') || keypair.contains('.') {
         Keypair::read_from_file(Path::new(&keypair)).unwrap()
     } else {
-        Keypair::from_base58_string(&keypair)
+        Keypair::from_base58_string(keypair)
     }
 }