diff --git a/crates/configuration/src/global_settings.rs b/crates/configuration/src/global_settings.rs index 66a4872c46b34c6aa41a2406a65e5d07b9522471..f6e73028979536592c44c68851f1bdef68c6cd1f 100644 --- a/crates/configuration/src/global_settings.rs +++ b/crates/configuration/src/global_settings.rs @@ -3,14 +3,15 @@ use std::{error::Error, fmt::Display, net::IpAddr, str::FromStr}; use multiaddr::Multiaddr; use serde::{Deserialize, Serialize}; -use crate::shared::{ - errors::{ConfigError, FieldError}, - helpers::{merge_errors, merge_errors_vecs}, - types::Duration, +use crate::{ + shared::{ + errors::{ConfigError, FieldError}, + helpers::{merge_errors, merge_errors_vecs}, + types::Duration, + }, + utils::default_node_spawn_timeout, }; -use crate::utils::default_node_spawn_timeout; - /// Global settings applied to an entire network. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct GlobalSettings { diff --git a/crates/configuration/src/network.rs b/crates/configuration/src/network.rs index b466794cad8629d016459f344dd1b0d531e537b7..11525f9508814e50e2302bb60527a4f132ff633b 100644 --- a/crates/configuration/src/network.rs +++ b/crates/configuration/src/network.rs @@ -107,13 +107,8 @@ impl NetworkConfig { .cloned() .collect(); - - let mut parachains: Vec<ParachainConfig> = network_config - .parachains() - .into_iter() - .cloned() - .collect(); - + let mut parachains: Vec<ParachainConfig> = + network_config.parachains().into_iter().cloned().collect(); // Validation checks for relay TryInto::<Chain>::try_into(network_config.relaychain().chain().as_str())?; @@ -156,11 +151,7 @@ impl NetworkConfig { let parachain_default_db_snapshot: Option<AssetLocation> = para.default_db_snapshot().cloned(); - let default_args: Vec<Arg> = para - .default_args() - .into_iter() - .cloned() - .collect(); + let default_args: Vec<Arg> = para.default_args().into_iter().cloned().collect(); let mut collators: Vec<NodeConfig> = para.collators().into_iter().cloned().collect(); @@ -204,8 +195,6 @@ impl NetworkConfig { } }); - - Ok(network_config) } } diff --git a/crates/configuration/src/parachain.rs b/crates/configuration/src/parachain.rs index 2d04f8ea59752ed45a3f9ec0e80a2a6f581034dd..daeb22e9d4958eedd5796590b938e18c022f8f91 100644 --- a/crates/configuration/src/parachain.rs +++ b/crates/configuration/src/parachain.rs @@ -18,7 +18,7 @@ use crate::{ Arg, AssetLocation, Chain, ChainDefaultContext, Command, Image, ValidationContext, U128, }, }, - utils::{default_as_true, default_initial_balance, default_command_polkadot}, + utils::{default_as_true, default_command_polkadot, default_initial_balance}, }; #[derive(Debug, Clone, PartialEq)] diff --git a/crates/configuration/src/relaychain.rs b/crates/configuration/src/relaychain.rs index 3a0016f7dbca3ff784b5b6f9965ae58bba2da81e..a3782cda2798152a2fab1c687fbe3bf6d2582973 100644 --- a/crates/configuration/src/relaychain.rs +++ b/crates/configuration/src/relaychain.rs @@ -2,18 +2,21 @@ use std::{cell::RefCell, error::Error, fmt::Debug, marker::PhantomData, rc::Rc}; use serde::{Deserialize, Serialize}; -use crate::shared::{ - constants::{DEFAULT_TYPESTATE, THIS_IS_A_BUG}, - errors::{ConfigError, FieldError}, - helpers::{merge_errors, merge_errors_vecs}, - macros::states, - node::{self, NodeConfig, NodeConfigBuilder}, - resources::{Resources, ResourcesBuilder}, - types::{Arg, AssetLocation, Chain, ChainDefaultContext, Command, Image, ValidationContext}, +use crate::{ + shared::{ + constants::{DEFAULT_TYPESTATE, THIS_IS_A_BUG}, + errors::{ConfigError, FieldError}, + helpers::{merge_errors, merge_errors_vecs}, + macros::states, + node::{self, NodeConfig, NodeConfigBuilder}, + resources::{Resources, ResourcesBuilder}, + types::{ + Arg, AssetLocation, Chain, ChainDefaultContext, Command, Image, ValidationContext, + }, + }, + utils::default_command_polkadot, }; -use crate::utils::default_command_polkadot; - /// A relay chain configuration, composed of nodes and fine-grained configuration options. #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct RelaychainConfig { diff --git a/crates/configuration/src/shared/node.rs b/crates/configuration/src/shared/node.rs index 323c9256c680dca2e3257f515dbb8d6f22f0e4df..16b3905e9b0ea4cbfe039ce200f167988d8e19de 100644 --- a/crates/configuration/src/shared/node.rs +++ b/crates/configuration/src/shared/node.rs @@ -15,7 +15,7 @@ use crate::{ resources::Resources, types::{Arg, Port}, }, - utils::{default_as_true, default_initial_balance} + utils::{default_as_true, default_initial_balance}, }; /// An environment variable with a name and a value. diff --git a/crates/configuration/src/utils.rs b/crates/configuration/src/utils.rs index a1d0cfec60ea45d2f7837d13fd171b7d617773f4..5f68d883c647eb208cd614bc83dc833adf9554af 100644 --- a/crates/configuration/src/utils.rs +++ b/crates/configuration/src/utils.rs @@ -1,4 +1,4 @@ -use crate::types::{Duration, Command}; +use crate::types::{Command, Duration}; pub(crate) fn is_true(value: &bool) -> bool { *value @@ -8,15 +8,14 @@ pub(crate) fn default_as_true() -> bool { true } - pub(crate) fn default_initial_balance() -> crate::types::U128 { 2_000_000_000_000.into() } -pub(crate) fn default_node_spawn_timeout () -> Duration { +pub(crate) fn default_node_spawn_timeout() -> Duration { 300 } -pub(crate) fn default_command_polkadot () -> Option<Command> { +pub(crate) fn default_command_polkadot() -> Option<Command> { TryInto::<Command>::try_into("polkadot").ok() -} \ No newline at end of file +}