Merge branch 'multi-node-setup' of github.com:chainwayxyz/citrea-e2e into new-sequencer-config

Author: jfldde

src/docker.rs

@@ -1,4 +1,4 @@
-#![allow(deprecated)] // Allowing deprecation for now as v0.19.1 has bogus warning messages that cannot be fixed as of now. TODO remove when possible
+#![allow(deprecated)] // Allowing deprecation for now as bollard v0.19.1 has bogus warning messages that cannot be fixed as of now. TODO remove when possible
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,

src/framework.rs

@@ -611,14 +611,14 @@ fn generate_sequencer_configs<T: TestCase>(
     dbs_dir: &Path,
     bind_host: &str,
 ) -> Result<Vec<FullSequencerConfig>> {
-    let sequencer = T::sequencer_config();
+    let sequencer = T::sequencer_cluster_config();
     let env = T::test_env();
     let throttle_config = T::throttle_config();
     let kind = NodeKind::Sequencer;
     let citrea_docker_image = std::env::var("CITREA_DOCKER_IMAGE").ok();
 
     let mut sequencer_configs = vec![];
-    for i in 0..test_case.get_n_nodes(kind) {
+    for (i, config) in (0..test_case.get_n_nodes(kind)).zip(sequencer.into_iter()) {
         let sequencer_dir = dir.join(i.to_string());
         std::fs::create_dir_all(&sequencer_dir)
             .with_context(|| format!("Failed to create {} directory", sequencer_dir.display()))?;
@@ -649,7 +649,7 @@ fn generate_sequencer_configs<T: TestCase>(
 
         sequencer_configs.push(FullSequencerConfig::new(
             NodeKind::Sequencer,
-            sequencer.clone(),
+            config,
             sequencer_rollup,
             citrea_docker_image.clone(),
             sequencer_dir,

src/test_case.rs

@@ -215,6 +215,13 @@ pub trait TestCase: Send + Sync + 'static {
         SequencerConfig::default()
     }
 
+    /// Returns the sequencer cluster configuration for the test.
+    /// Override this method to provide a custom sequencer cluster configuration.
+    /// TODO remove when consolidated to single sequencer/sequencer_cluster handling
+    fn sequencer_cluster_config() -> Vec<SequencerConfig> {
+        vec![Self::sequencer_config()]
+    }
+
     /// Returns the batch prover configuration for the test.
     /// Override this method to provide a custom batch prover configuration.
     fn batch_prover_config() -> BatchProverConfig {