Handle unique validation when parachain id is same

crates/configuration/src/parachain.rs

@@ -10,7 +10,7 @@ use serde::{
 use crate::{
     shared::{
         errors::{ConfigError, FieldError},
-        helpers::{merge_errors, merge_errors_vecs},
+        helpers::{ensure_parachain_id_unique, merge_errors, merge_errors_vecs},
         macros::states,
         node::{self, NodeConfig, NodeConfigBuilder},
         resources::{Resources, ResourcesBuilder},
@@ -298,13 +298,19 @@ impl ParachainConfigBuilder<Initial> {
     }
 
     /// Set the parachain ID (should be unique).
-    // TODO: handle unique validation
     pub fn with_id(self, id: u32) -> ParachainConfigBuilder<WithId> {
-        Self::transition(
-            ParachainConfig { id, ..self.config },
-            self.validation_context,
-            self.errors,
-        )
+        match ensure_parachain_id_unique(id, self.validation_context.clone()) {
+            Ok(_) => Self::transition(
+                ParachainConfig { id, ..self.config },
+                self.validation_context,
+                self.errors,
+            ),
+            Err(error) => Self::transition(
+                self.config,
+                self.validation_context,
+                merge_errors(self.errors, error),
+            ),
+        }
     }
 }
 
@@ -677,7 +683,7 @@ impl ParachainConfigBuilder<WithAtLeastOneCollator> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::NetworkConfig;
+    use crate::{NetworkConfig, NetworkConfigBuilder};
 
     #[test]
     fn parachain_config_builder_should_succeeds_and_returns_a_new_parachain_config() {
@@ -1062,6 +1068,35 @@ mod tests {
         );
     }
 
+    #[test]
+    #[should_panic(expected = "'1000' is already used across config")]
+    fn parachains_with_same_id_should_fail() {
+        let network = NetworkConfigBuilder::new()
+            .with_relaychain(|relaychain| {
+                relaychain
+                    .with_chain("polkadot")
+                    .with_node(|node| node.with_name("alice"))
+            })
+            .with_parachain(|parachain| {
+                parachain
+                    .with_id(1000)
+                    .with_collator(|collator| collator.with_name("charles"))
+            })
+            .with_parachain(|parachain| {
+                parachain
+                    .with_id(1000)
+                    .with_collator(|collator| collator.with_name("jim"))
+            })
+            .build()
+            .unwrap();
+
+        network.parachains().iter().for_each(|parachain| {
+            if parachain.id() != 1000 {
+                assert_eq!(parachain.id(), 1001);
+            }
+        });
+    }
+
     #[test]
     fn import_toml_registration_strategy_should_deserialize() {
         let load_from_toml =

crates/configuration/src/shared/errors.rs

@@ -104,4 +104,7 @@ pub enum ValidationError {
 
     #[error("'{0}' is already used across config")]
     NodeNameAlreadyUsed(String),
+
+    #[error("'{0}' is already used across config")]
+    ParachainIdAlreadyUsed(ParaId),
 }

crates/configuration/src/shared/helpers.rs

@@ -3,7 +3,7 @@ use std::{cell::RefCell, rc::Rc};
 use super::{
     constants::{BORROWABLE, THIS_IS_A_BUG},
     errors::ValidationError,
-    types::{Port, ValidationContext},
+    types::{ParaId, Port, ValidationContext},
 };
 
 pub fn merge_errors(errors: Vec<anyhow::Error>, new_error: anyhow::Error) -> Vec<anyhow::Error> {
@@ -57,3 +57,19 @@ pub fn ensure_port_unique(
 
     Err(ValidationError::PortAlreadyUsed(port).into())
 }
+
+pub fn ensure_parachain_id_unique(
+    id: ParaId,
+    validation_context: Rc<RefCell<ValidationContext>>,
+) -> Result<(), anyhow::Error> {
+    let mut context = validation_context
+        .try_borrow_mut()
+        .expect(&format!("{}, {}", BORROWABLE, THIS_IS_A_BUG));
+
+    if !context.used_parachain_ids.contains(&id) {
+        context.used_parachain_ids.push(id);
+        return Ok(());
+    }
+
+    Err(ValidationError::ParachainIdAlreadyUsed(id).into())
+}

crates/configuration/src/shared/types.rs

@@ -394,6 +394,7 @@ impl<'de> Deserialize<'de> for Arg {
 pub struct ValidationContext {
     pub used_ports: Vec<Port>,
     pub used_nodes_names: Vec<String>,
+    pub used_parachain_ids: Vec<ParaId>,
 }
 
 #[derive(Default, Debug, Clone, PartialEq, Deserialize)]