refactor(e2e): remove distinction master/slave aggregator

As master/slave signer registration is only one of the configurations to be tested.

Author: jpraynaud

mithril-test-lab/mithril-end-to-end/src/end_to_end_spec.rs

@@ -51,60 +51,48 @@ impl Spec {
     }
 
     pub async fn run(self) -> StdResult<()> {
+        let mut join_set = JoinSet::new();
         let spec = Arc::new(self);
         let infrastructure_guard = spec.infrastructure.read().await;
         let infrastructure = infrastructure_guard
             .as_ref()
             .ok_or(anyhow!("No infrastructure found"))?;
+        let aggregators = infrastructure_guard
+            .as_ref()
+            .ok_or(anyhow!("No infrastructure found"))?
+            .aggregators();
 
         // Transfer some funds on the devnet to have some Cardano transactions to sign.
         // This step needs to be executed early in the process so that the transactions are available
         // for signing in the penultimate immutable chunk before the end of the test.
         // As we get closer to the tip of the chain when signing, we'll be able to relax this constraint.
         assertions::transfer_funds(infrastructure.devnet()).await?;
 
-        let mut join_set = JoinSet::new();
-        let spec_clone = spec.clone();
-        join_set.spawn(async move { spec_clone.start_master().await });
-        for index in 0..infrastructure.slave_aggregators().len() {
+        for index in 0..aggregators.len() {
             let spec_clone = spec.clone();
-            join_set.spawn(async move { spec_clone.start_slave(index).await });
+            join_set.spawn(async move {
+                let infrastructure_guard = spec_clone.infrastructure.read().await;
+                let infrastructure = infrastructure_guard
+                    .as_ref()
+                    .ok_or(anyhow!("No infrastructure found"))?;
+
+                spec_clone
+                    .start_aggregator(
+                        infrastructure.aggregator(index),
+                        infrastructure.chain_observer(index),
+                        infrastructure,
+                    )
+                    .await
+            });
         }
+
         while let Some(res) = join_set.join_next().await {
             res??;
         }
 
         Ok(())
     }
 
-    pub async fn start_master(&self) -> StdResult<()> {
-        let infrastructure_guard = self.infrastructure.read().await;
-        let infrastructure = infrastructure_guard
-            .as_ref()
-            .ok_or(anyhow!("No infrastructure found"))?;
-
-        self.start_aggregator(
-            infrastructure.master_aggregator(),
-            infrastructure.master_chain_observer(),
-            infrastructure,
-        )
-        .await
-    }
-
-    pub async fn start_slave(&self, slave_index: usize) -> StdResult<()> {
-        let infrastructure_guard = self.infrastructure.read().await;
-        let infrastructure = infrastructure_guard
-            .as_ref()
-            .ok_or(anyhow!("No infrastructure found"))?;
-
-        self.start_aggregator(
-            infrastructure.slave_aggregator(slave_index),
-            infrastructure.slave_chain_observer(slave_index),
-            infrastructure,
-        )
-        .await
-    }
-
     pub async fn start_aggregator(
         &self,
         aggregator: &Aggregator,
@@ -138,7 +126,7 @@ impl Spec {
         )
         .await?;
 
-        if aggregator.index() == 0 {
+        if aggregator.is_first() {
             // Delegate some stakes to pools
             let delegation_round = 1;
             assertions::delegate_stakes_to_pools(infrastructure.devnet(), delegation_round).await?;

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

@@ -17,7 +17,6 @@ use tokio::sync::RwLock;
 
 #[derive(Debug)]
 pub struct AggregatorConfig<'a> {
-    pub is_master: bool,
     pub index: usize,
     pub name: &'a str,
     pub server_port: u64,
@@ -39,7 +38,6 @@ pub struct AggregatorConfig<'a> {
 
 #[derive(Debug)]
 pub struct Aggregator {
-    is_master: bool,
     index: usize,
     name_suffix: String,
     server_port: u64,
@@ -135,7 +133,6 @@ impl Aggregator {
         command.set_log_name(&format!("mithril-aggregator-{}", aggregator_config.name,));
 
         Ok(Self {
-            is_master: aggregator_config.is_master,
             index: aggregator_config.index,
             name_suffix: aggregator_config.name.to_string(),
             server_port: aggregator_config.server_port,
@@ -145,9 +142,12 @@ impl Aggregator {
         })
     }
 
+    pub fn name_suffix(index: usize) -> String {
+        format!("{}", index + 1)
+    }
+
     pub fn copy_configuration(other: &Aggregator) -> Self {
         Self {
-            is_master: other.is_master,
             index: other.index,
             name_suffix: other.name_suffix.clone(),
             server_port: other.server_port,
@@ -157,8 +157,8 @@ impl Aggregator {
         }
     }
 
-    pub fn is_master(&self) -> bool {
-        self.is_master
+    pub fn is_first(&self) -> bool {
+        self.index == 0
     }
 
     pub fn index(&self) -> usize {