diff --git a/src/cli/explorer.rs b/src/cli/explorer.rs index 49f3a92..8798077 100644 --- a/src/cli/explorer.rs +++ b/src/cli/explorer.rs @@ -1,10 +1,10 @@ +use std::collections::HashMap; + use bollard::models::{HostConfig, PortBinding}; +use clap::Args; use rand::distributions::Alphanumeric; use rand::Rng; -use clap::Args; -use std::collections::HashMap; - use crate::utils::docker::{container_exists, kill_container, run_docker_image}; #[derive(Args)] diff --git a/src/da/avail.rs b/src/da/avail.rs index d6eb2e1..68f2a78 100644 --- a/src/da/avail.rs +++ b/src/da/avail.rs @@ -1,13 +1,13 @@ -use async_trait::async_trait; use std::fs; -use crate::app::config::AppChainConfig; -use crate::cli::prompt::get_boolean_input; +use async_trait::async_trait; use hex::encode; use serde::{Deserialize, Serialize}; use sp_core::{sr25519, Pair}; use thiserror::Error; +use crate::app::config::AppChainConfig; +use crate::cli::prompt::get_boolean_input; use crate::da::da_layers::{DaClient, DaError}; pub struct AvailClient; @@ -49,7 +49,8 @@ impl DaClient for AvailClient { AVAIL_DOCS ); log::info!( - "🛠️ If you want to use a custom Avail address, please enter your seed and address in the config file: {}.", + "🛠️ If you want to use a custom Avail address, please enter your seed and address in the config file: \ + {}.", file_path_str ); } diff --git a/src/da/da_layers.rs b/src/da/da_layers.rs index 2887349..51496e2 100644 --- a/src/da/da_layers.rs +++ b/src/da/da_layers.rs @@ -1,19 +1,18 @@ -use async_trait::async_trait; use std::io; use std::path::PathBuf; +use async_trait::async_trait; +use eyre::Result as EyreResult; use serde::{Deserialize, Serialize}; use strum_macros::{Display, EnumIter, EnumString}; use thiserror::Error; use crate::app::config::AppChainConfig; use crate::da::avail::{AvailClient, AvailError}; -use crate::da::ethereum::EthereumClient; -use crate::da::ethereum::EthereumError; +use crate::da::ethereum::{EthereumClient, EthereumError}; use crate::da::no_da::NoDAConfig; use crate::utils::constants::APP_DA_CONFIG_NAME; use crate::utils::paths::get_app_home; -use eyre::Result as EyreResult; #[derive(Debug, Serialize, Deserialize, EnumIter, Display, Clone, EnumString, clap::ValueEnum)] pub enum DALayer { diff --git a/src/da/ethereum.rs b/src/da/ethereum.rs index 9332ae0..e28466a 100644 --- a/src/da/ethereum.rs +++ b/src/da/ethereum.rs @@ -1,23 +1,21 @@ -use crate::app::config::AppChainConfig; -use crate::da::da_layers::{DaClient, DaError}; -use crate::utils::serde::bytes_from_hex_str; -use async_trait::async_trait; -use eyre::Result as EyreResult; +use std::fs; +use std::str::FromStr; +use std::sync::Arc; +use std::time::Duration; +use async_trait::async_trait; use ethers::contract::abigen; - use ethers::middleware::SignerMiddleware; use ethers::providers::{Http, Provider}; use ethers::signers::{LocalWallet, Signer, WalletError}; - +use eyre::Result as EyreResult; use serde::{Deserialize, Serialize}; -use std::fs; +use thiserror::Error; +use crate::app::config::AppChainConfig; use crate::cli::prompt::get_boolean_input; -use std::str::FromStr; -use std::sync::Arc; -use std::time::Duration; -use thiserror::Error; +use crate::da::da_layers::{DaClient, DaError}; +use crate::utils::serde::bytes_from_hex_str; pub struct EthereumClient; @@ -72,7 +70,12 @@ impl DaClient for EthereumClient { async fn setup(&self, config: &AppChainConfig) -> EyreResult<()> { match get_boolean_input( - format!("Are you running an Anvil node locally? The CLI tool has been tested on Anvil version 0.2.0 (c312c0d). Docs: {}", ANVIL_DOCS).as_str(), + format!( + "Are you running an Anvil node locally? The CLI tool has been tested on Anvil version 0.2.0 \ + (c312c0d). Docs: {}", + ANVIL_DOCS + ) + .as_str(), Some(true), )? { true => Ok(()), diff --git a/src/da/no_da.rs b/src/da/no_da.rs index 6c97157..17cc4e0 100644 --- a/src/da/no_da.rs +++ b/src/da/no_da.rs @@ -1,8 +1,9 @@ pub struct NoDAConfig; +use async_trait::async_trait; + use crate::app::config::AppChainConfig; use crate::da::da_layers::{DaClient, DaError}; -use async_trait::async_trait; #[async_trait] impl DaClient for NoDAConfig { diff --git a/src/utils/errors.rs b/src/utils/errors.rs index 3ab73f2..2cb0112 100644 --- a/src/utils/errors.rs +++ b/src/utils/errors.rs @@ -1,4 +1,5 @@ use std::ffi::OsString; + use thiserror::Error; #[derive(Debug, Error)] diff --git a/src/utils/github.rs b/src/utils/github.rs index 5efee3a..9a2cac7 100644 --- a/src/utils/github.rs +++ b/src/utils/github.rs @@ -2,11 +2,11 @@ use std::fs; use std::path::PathBuf; use std::process::{Command, Stdio}; -use crate::utils::cmd::{execute_cmd, execute_cmd_stdio}; use git2::Repository; use reqwest::Client; use serde::Deserialize; +use crate::utils::cmd::{execute_cmd, execute_cmd_stdio}; use crate::utils::errors::GithubError; pub const GITHUB_API_BASE_URL: &str = "https://api.github.com";