From d6bd2084ca754938f20c0bbd2591d739bbd4a4e5 Mon Sep 17 00:00:00 2001 From: Anshal Shukla Date: Tue, 2 Jan 2024 00:33:53 +0530 Subject: [PATCH] mod: cargo fmt --- src/app/config.rs | 7 ++----- src/cli/init.rs | 8 ++------ src/main.rs | 2 +- src/utils/avail.rs | 41 ++++++++++++----------------------------- src/utils/cmd.rs | 7 +++---- src/utils/madara.rs | 23 ++++++----------------- src/utils/mod.rs | 2 +- 7 files changed, 27 insertions(+), 63 deletions(-) diff --git a/src/app/config.rs b/src/app/config.rs index 0ac8a8c..ee389f7 100644 --- a/src/app/config.rs +++ b/src/app/config.rs @@ -26,7 +26,7 @@ impl AppChainConfig { } pub fn fund_msg(&self) { match &self.da_layer { - DALayer::Avail { seed: _seed, public_key} => { + DALayer::Avail { seed: _seed, public_key } => { println!(); println!("Please fund {} with atleast 1 AVL", public_key); } @@ -61,10 +61,7 @@ pub enum RollupMode { #[derive(Debug, Serialize, Deserialize, EnumIter, Display)] pub enum DALayer { - Avail { - seed: String, - public_key: String, - }, + Avail { seed: String, public_key: String }, Celestia, Ethereum, NoDA, diff --git a/src/cli/init.rs b/src/cli/init.rs index 773e928..7c1677f 100644 --- a/src/cli/init.rs +++ b/src/cli/init.rs @@ -62,12 +62,8 @@ fn generate_config() -> Result { let config_version = ConfigVersion::Version1; let result = match da_layer_type { - DALayer::Avail{ .. } => { - setup_and_generate_keypair(&app_chain) - } - _ => { - Ok(da_layer_type) - } + DALayer::Avail { .. } => setup_and_generate_keypair(&app_chain), + _ => Ok(da_layer_type), }; let da_layer = match result { Ok(da_config) => da_config, diff --git a/src/main.rs b/src/main.rs index d19d6a8..696ba49 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use clap::{Parser, Subcommand}; -use madara_cli::{cli}; +use madara_cli::cli; #[derive(Parser)] #[command(author, version, about, long_about = None)] diff --git a/src/utils/avail.rs b/src/utils/avail.rs index ec79ee4..ed671df 100644 --- a/src/utils/avail.rs +++ b/src/utils/avail.rs @@ -1,11 +1,13 @@ -use std::{fs, io}; use std::process::Stdio; use std::string::FromUtf8Error; +use std::{fs, io}; + +use serde_json::{json, Value}; use thiserror::Error; + +use crate::app::config::DALayer; use crate::utils::cmd::{execute_cmd, execute_cmd_stdout}; use crate::utils::paths::{get_app_home, get_madara_home}; -use serde_json::{json,Value}; -use crate::app::config::{DALayer}; #[derive(Debug, Error)] pub enum AvailKeyGenError { @@ -25,11 +27,7 @@ pub fn setup_and_generate_keypair(app_chain: &str) -> Result Result<(), AvailKeyGenError> { let madara_home = get_madara_home()?; - execute_cmd( - "cargo", - &["install", "subkey"], - &madara_home - )?; + execute_cmd("cargo", &["install", "subkey"], &madara_home)?; Ok(()) } @@ -39,28 +37,16 @@ fn generate_keypair(app_chain: &str) -> Result { let app_home = get_app_home(app_chain)?; let full_file_path = app_home.join(keypair_file); - execute_cmd( - "cargo", - &["install", "subkey"], - &madara_home - )?; + execute_cmd("cargo", &["install", "subkey"], &madara_home)?; - let output = execute_cmd_stdout( - "subkey", - &["generate", "--output-type=json"], - &madara_home, - Stdio::piped() - )?; + let output = execute_cmd_stdout("subkey", &["generate", "--output-type=json"], &madara_home, Stdio::piped())?; let keypair_str = String::from_utf8(output.stdout)?; let keypair_json: Value = serde_json::from_str(&keypair_str)?; let seed = keypair_json["secretSeed"].to_string(); - let public_key = keypair_json["publicKey"].to_string(); - let avail = DALayer::Avail { - seed: seed.clone(), - public_key, - }; + let public_key = keypair_json["publicKey"].to_string(); + let avail = DALayer::Avail { seed: seed.clone(), public_key }; if let Err(err) = fs::write(full_file_path, &keypair_str) { panic!("Error writing to file: {}", err); @@ -88,10 +74,7 @@ fn generate_avail_connect_config(app_chain: &str, seed: &str) -> Result<(), Avai let avail_connect_string = serde_json::to_string(&avail_connect)?; // "\"{seed}\"" is invalid so converted it to "{seed}" - let avail_connect_string_modified = avail_connect_string - .replace("\"\\\"", "\"") - .replace("\\\"\"", "\""); - + let avail_connect_string_modified = avail_connect_string.replace("\"\\\"", "\"").replace("\\\"\"", "\""); if let Err(err) = fs::write(full_file_path, &avail_connect_string_modified) { panic!("Error writing to file: {}", err); @@ -100,4 +83,4 @@ fn generate_avail_connect_config(app_chain: &str, seed: &str) -> Result<(), Avai } Ok(()) -} \ No newline at end of file +} diff --git a/src/utils/cmd.rs b/src/utils/cmd.rs index 4ed9431..158216b 100644 --- a/src/utils/cmd.rs +++ b/src/utils/cmd.rs @@ -3,13 +3,12 @@ use std::path::PathBuf; use std::process::{Command, Output, Stdio}; pub fn execute_cmd(program: &str, args: &[&str], dir: &PathBuf) -> Result { - let output =execute_cmd_stdout(program, args, dir, Stdio::inherit())?; + let output = execute_cmd_stdout(program, args, dir, Stdio::inherit())?; Ok(output) } pub fn execute_cmd_stdout(program: &str, args: &[&str], dir: &PathBuf, out: Stdio) -> Result { - let result = - Command::new(program).current_dir(dir).args(args).stdout(out).stderr(Stdio::inherit()).output(); + let result = Command::new(program).current_dir(dir).args(args).stdout(out).stderr(Stdio::inherit()).output(); match result { Ok(output) => { @@ -25,4 +24,4 @@ pub fn execute_cmd_stdout(program: &str, args: &[&str], dir: &PathBuf, out: Stdi Err(err) } } -} \ No newline at end of file +} diff --git a/src/utils/madara.rs b/src/utils/madara.rs index efc4416..66b1113 100644 --- a/src/utils/madara.rs +++ b/src/utils/madara.rs @@ -20,11 +20,7 @@ pub fn clone_madara_and_build_repo() -> Result<(), MadaraError> { return Err(MadaraError::FailedToCloneRepo); } } - execute_cmd( - "cargo", - &["build", "--release"], - &madara_path - )?; + execute_cmd("cargo", &["build", "--release"], &madara_path)?; Ok(()) } @@ -52,27 +48,20 @@ pub fn setup_and_run_madara(app_chain: &str) -> Result<(), MadaraError> { let da_conf = format!("--da-conf={}", da_config_path); let base_path = format!("--base-path={}", config.base_path); - let mut args = vec!["--chain=dev", "--alice", "--force-authoring", "--rpc-cors=all", "--tx-ban-seconds=0", &base_path]; + let mut args = + vec!["--chain=dev", "--alice", "--force-authoring", "--rpc-cors=all", "--tx-ban-seconds=0", &base_path]; match &config.da_layer { - DALayer::Avail{ .. } => { + DALayer::Avail { .. } => { let avail_conf = vec!["--da-layer=avail", &da_conf]; args.extend(avail_conf); } _ => {} } - execute_cmd( - "cargo", - &["run", "--release", "setup", "--chain=dev", "--from-remote", &base_path], - &madara_path - )?; + execute_cmd("cargo", &["run", "--release", "setup", "--chain=dev", "--from-remote", &base_path], &madara_path)?; - execute_cmd( - "./target/release/madara", - args.as_slice(), - &madara_path, - )?; + execute_cmd("./target/release/madara", args.as_slice(), &madara_path)?; Ok(()) } diff --git a/src/utils/mod.rs b/src/utils/mod.rs index df9b9ed..74cb55c 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -8,5 +8,5 @@ pub mod madara; pub mod errors; -pub mod toml; pub mod avail; +pub mod toml;