fix: clippy warnings

Near-One · Jan 20, 2025 · 9d980b8 · 9d980b8
1 parent c5ef05b
commit 9d980b8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/bridge-cli/src/eth_connector_command.rs b/bridge-cli/src/eth_connector_command.rs
@@ -102,7 +102,7 @@ pub async fn match_subcommand(cmd: EthConnectorSubCommand, network: Network) {
 }
 
 fn eth_connector(network: Network, cli_config: CliConfig) -> EthConnector {
-    let combined_config = combined_config(cli_config, network);
+    let combined_config = combined_config(cli_config, &network);
 
     EthConnectorBuilder::default()
         .eth_endpoint(combined_config.eth_rpc)

diff --git a/bridge-cli/src/fast_bridge_command.rs b/bridge-cli/src/fast_bridge_command.rs
@@ -145,7 +145,7 @@ pub async fn match_subcommand(cmd: FastBridgeSubCommand, network: Network) {
 }
 
 fn fast_bridge(network: Network, cli_config: CliConfig) -> FastBridge {
-    let combined_config = combined_config(cli_config, network);
+    let combined_config = combined_config(cli_config, &network);
 
     FastBridgeBuilder::default()
         .eth_endpoint(combined_config.eth_rpc)

diff --git a/bridge-cli/src/main.rs b/bridge-cli/src/main.rs
@@ -177,7 +177,7 @@ fn env_config() -> CliConfig {
     }
 }
 
-fn default_config(network: Network) -> CliConfig {
+fn default_config(network: &Network) -> CliConfig {
     match network {
         Network::Mainnet => CliConfig {
             near_rpc: Some(defaults::NEAR_RPC_MAINNET.to_owned()),
@@ -277,7 +277,7 @@ fn file_config(path: &str) -> CliConfig {
     serde_json::from_reader(reader).expect("Unable to parse config file")
 }
 
-fn combined_config(cli_config: CliConfig, network: Network) -> CliConfig {
+fn combined_config(cli_config: CliConfig, network: &Network) -> CliConfig {
     let file_config = cli_config
         .config_file
         .as_ref()
@@ -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/nep141_connector_command.rs b/bridge-cli/src/nep141_connector_command.rs
@@ -133,7 +133,7 @@ pub async fn match_subcommand(cmd: Nep141ConnectorSubCommand, network: Network)
 }
 
 fn nep141_connector(network: Network, cli_config: CliConfig) -> Nep141Connector {
-    let combined_config = combined_config(cli_config, network);
+    let combined_config = combined_config(cli_config, &network);
 
     Nep141ConnectorBuilder::default()
         .eth_endpoint(combined_config.eth_rpc)

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();
         }
@@ -488,7 +489,7 @@ pub async fn match_subcommand(cmd: OmniConnectorSubCommand, network: Network) {
 }
 
 fn omni_connector(network: Network, cli_config: CliConfig) -> OmniConnector {
-    let combined_config = combined_config(cli_config, network);
+    let combined_config = combined_config(cli_config, &network);
 
     let near_bridge_client = NearBridgeClientBuilder::default()
         .endpoint(combined_config.near_rpc)
@@ -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)
     }
 }