Merge pull request #100 from paritytech/nik-toml-to-network

crates/configuration/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 regex = { workspace = true }
 lazy_static = { workspace = true }
 multiaddr = { workspace = true }
-url = { workspace = true }
+url = { workspace = true, features = ["serde"] }
 thiserror = { workspace = true }
 anyhow = { workspace = true }
 serde = { workspace = true, features = ["derive"] }

crates/configuration/src/global_settings.rs

@@ -1,7 +1,7 @@
 use std::{error::Error, fmt::Display, net::IpAddr, str::FromStr};
 
 use multiaddr::Multiaddr;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::shared::{
     errors::{ConfigError, FieldError},
@@ -10,9 +10,9 @@ use crate::shared::{
 };
 
 /// Global settings applied to an entire network.
-#[derive(Debug, Clone, PartialEq, Serialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct GlobalSettings {
-    #[serde(skip_serializing_if = "std::vec::Vec::is_empty")]
+    #[serde(skip_serializing_if = "std::vec::Vec::is_empty", default)]
     bootnodes_addresses: Vec<Multiaddr>,
     // TODO: parse both case in zombienet node version to avoid renamed ?
     #[serde(rename = "timeout")]

crates/configuration/src/hrmp_channel.rs

@@ -1,11 +1,11 @@
 use std::marker::PhantomData;
 
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::shared::{macros::states, types::ParaId};
 
 /// HRMP channel configuration, with fine-grained configuration options.
-#[derive(Debug, Clone, PartialEq, Serialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct HrmpChannelConfig {
     sender: ParaId,
     recipient: ParaId,

crates/configuration/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::expect_fun_call)]
 mod global_settings;
 mod hrmp_channel;
 mod network;