Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
anshalshukla committed Feb 15, 2024
1 parent 0d04e45 commit bb9a4ba
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 33 deletions.
35 changes: 18 additions & 17 deletions src/cli/init.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::{fs, io};
use std::str::FromStr;
use std::{fs, io};

use inquire::InquireError;
use strum::IntoEnumIterator;
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 4 additions & 6 deletions src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
20 changes: 10 additions & 10 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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"),
}
Expand Down

0 comments on commit bb9a4ba

Please sign in to comment.