mod: cargo fmt

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,

src/cli/init.rs

@@ -62,12 +62,8 @@ fn generate_config() -> Result<AppChainConfig, InitError> {
     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,

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)]

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<DALayer, AvailKeyGe
 }
 fn install_subkey() -> 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<DALayer, AvailKeyGenError> {
     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(())
-}
+}

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<Output, Error> {
-    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<Output, Error> {
-    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)
         }
     }
-}
+}

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(())
 }

src/utils/mod.rs

@@ -8,5 +8,5 @@ pub mod madara;
 
 pub mod errors;
 
-pub mod toml;
 pub mod avail;
+pub mod toml;