From bb9a4bac5a01785d938b5a289011beb2d7727ed5 Mon Sep 17 00:00:00 2001
From: Anshal Shukla <shukla.anshal85@gmail.com>
Date: Fri, 16 Feb 2024 02:56:13 +0530
Subject: [PATCH] fix: lint

---
 src/cli/init.rs | 35 ++++++++++++++++++-----------------
 src/cli/run.rs  | 10 ++++------
 src/main.rs     | 20 ++++++++++----------
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/cli/init.rs b/src/cli/init.rs
index 427df84..6448b2d 100644
--- a/src/cli/init.rs
+++ b/src/cli/init.rs
@@ -1,5 +1,5 @@
-use std::{fs, io};
 use std::str::FromStr;
+use std::{fs, io};
 
 use inquire::InquireError;
 use strum::IntoEnumIterator;
@@ -47,28 +47,29 @@ pub async fn init(chain_name: &Option<String>, chain_mode: &Option<String>, da:
     log::info!("✅ New app chain initialised.");
 }
 
-async fn generate_config(chain_name: &Option<String>, chain_mode: &Option<String>, da: &Option<String>) -> Result<AppChainConfig, InitError> {
-    let app_chain: String;
-    match chain_name {
-        Some(chain_name) => app_chain = chain_name.clone(),
-        None => app_chain = get_text_input("Enter you app chain name:", Some("madara"))?,
-    }
+async fn generate_config(
+    chain_name: &Option<String>,
+    chain_mode: &Option<String>,
+    da: &Option<String>,
+) -> Result<AppChainConfig, InitError> {
+    let app_chain: String = match chain_name {
+        Some(chain_name) => chain_name.clone(),
+        None => get_text_input("Enter you app chain name:", Some("madara"))?,
+    };
 
     let app_chains_home = get_app_chains_home()?;
     let binding = app_chains_home.join(format!("{}/data", app_chain));
     let default_base_path = binding.to_str().unwrap_or("madara-data");
 
-    let mode: RollupMode;
-    match chain_mode {
-        Some(chain_mode) => mode = RollupMode::from_str(chain_mode)?,
-        None => mode = get_option("Select mode for your app chain:", RollupMode::iter().collect::<Vec<_>>())?,
-    }
+    let mode: RollupMode = match chain_mode {
+        Some(chain_mode) => RollupMode::from_str(chain_mode)?,
+        None => get_option("Select mode for your app chain:", RollupMode::iter().collect::<Vec<_>>())?,
+    };
 
-    let da_layer: DALayer;
-    match da {
-        Some(da) => da_layer = DALayer::from_str(da)?,
-        None => da_layer = get_option("Select DA layer for your app chain:", DALayer::iter().collect::<Vec<_>>())?,
-    }
+    let da_layer: DALayer = match da {
+        Some(da) => DALayer::from_str(da)?,
+        None => get_option("Select DA layer for your app chain:", DALayer::iter().collect::<Vec<_>>())?,
+    };
 
     let madara_version = get_latest_commit_hash(MADARA_REPO_ORG, MADARA_REPO_NAME, MADARA_BRANCH_NAME).await?;
     let config_version = ConfigVersion::Version2;
diff --git a/src/cli/run.rs b/src/cli/run.rs
index 3a34703..44bd031 100644
--- a/src/cli/run.rs
+++ b/src/cli/run.rs
@@ -36,15 +36,13 @@ pub async fn run(chain_name: &Option<String>) {
 }
 
 async fn start_app_chain(chain_name: &Option<String>) -> Result<(), RunError> {
-    let app_chain: String;
-    match chain_name {
-        Some(chain_name) => app_chain = chain_name.to_string(),
+    let app_chain: String = match chain_name {
+        Some(chain_name) => chain_name.to_string(),
         None => {
             let app_chains_list = get_apps_list()?;
-            let app = get_option("Select the app chain:", app_chains_list)?;
-            app_chain = app;
+            get_option("Select the app chain:", app_chains_list)?
         }
-    }
+    };
 
     let (config, _) = match regenerate_app_config(&app_chain) {
         Ok((config, valid)) => (config, valid),
diff --git a/src/main.rs b/src/main.rs
index 45c7edd..9643f5e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,22 +15,22 @@ enum Commands {
     /// Init a new App Chain config
     Init {
         /// App chain name
-        #[arg(short, long)]
-        chain_name: Option<String>,
+        #[arg(short, long = "chain-name")]
+        name: Option<String>,
         /// Select Sovereign
-        #[arg(short, long)]
-        chain_mode: Option<String>,
+        #[arg(short, long = "chain-mode")]
+        mode: Option<String>,
         /// Select between Avail, Celestia, Ethereum, NoDA
-        #[arg(short, long)]
-        da: Option<String>
+        #[arg(short, long = "da-layer")]
+        da: Option<String>,
     },
     /// Lists all the existing App Chain configs
     List,
     /// Runs the App Chain using Madara
     Run {
         /// App chain name
-        #[arg(short, long)]
-        chain_name: Option<String>,
+        #[arg(short, long = "chain-name")]
+        name: Option<String>,
     },
     /// Runs the L2 explorer
     Explorer(ExplorerOpts),
@@ -48,9 +48,9 @@ async fn main() {
     let cli = Cli::parse();
 
     match &cli.command {
-        Some(Commands::Init{chain_name, chain_mode, da}) => cli::init::init(chain_name, chain_mode, da).await,
+        Some(Commands::Init { name, mode, da }) => cli::init::init(name, mode, da).await,
         Some(Commands::List) => cli::list::list(),
-        Some(Commands::Run{chain_name}) => cli::run::run(chain_name).await,
+        Some(Commands::Run { name }) => cli::run::run(name).await,
         Some(Commands::Explorer(opts)) => cli::explorer::explorer(opts).await,
         None => log::info!("Use --help to see the complete list of available commands"),
     }