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

Author: jfldde

src/config/mod.rs

@@ -123,16 +123,23 @@ where
             throttle,
         };
 
-        // Write configs to files
-        if let Some(config) = conf.node_config() {
-            let config_path = dir.join(format!("{}_config.toml", conf.kind));
+        conf.write_to_file()?;
+
+        Ok(conf)
+    }
+
+    // Write configs to files
+    pub fn write_to_file(&self) -> Result<()> {
+        let dir = &self.base.dir;
+        if let Some(config) = self.node_config() {
+            let config_path = dir.join(format!("{}_config.toml", self.kind));
             config_to_file(config, &config_path)?;
         }
 
-        let rollup_path = dir.join(format!("{}_rollup_config.toml", conf.kind));
-        config_to_file(&conf.rollup, &rollup_path)?;
+        let rollup_path = dir.join(format!("{}_rollup_config.toml", self.kind));
+        config_to_file(&self.rollup, &rollup_path)?;
 
-        Ok(conf)
+        Ok(())
     }
 }
 

src/node.rs

@@ -327,16 +327,8 @@ where
         ));
         copy_directory(old_dir, &new_dir)?;
 
-        // Replace the config files with the new ones
-        let rollup_config_path = new_dir.join(format!("{}_rollup_config.toml", config.kind()));
-        config_to_file(&config.rollup, &rollup_config_path)?;
-        if let Some(node_config) = config.node_config() {
-            let node_config_path = new_dir.join(format!("{}_config.toml", config.kind()));
-            config_to_file(&node_config, &node_config_path)?;
-        }
+        config.write_to_file()?;
 
-        config.set_dir(new_dir);
-        // Replace config contents
         *self.spawn_output() = Self::spawn(config, extra_args)?;
         self.wait_for_ready(None).await
     }