config: Add clementine node to config.

Author: ceyhunsen

src/config/mod.rs

@@ -8,8 +8,8 @@ mod utils;
 
 use std::path::PathBuf;
 
-pub use clementine::{ClementineClient, ClementineConfig};
 pub use bitcoin::BitcoinConfig;
+pub use clementine::{ClementineClient, ClementineConfig};
 pub use docker::DockerConfig;
 pub use rollup::{default_rollup_config, RollupConfig};
 use serde::Serialize;
@@ -41,7 +41,6 @@ pub struct FullL2NodeConfig<T> {
 pub type FullSequencerConfig = FullL2NodeConfig<SequencerConfig>;
 pub type FullBatchProverConfig = FullL2NodeConfig<BatchProverConfig>;
 pub type FullLightClientProverConfig = FullL2NodeConfig<LightClientProverConfig>;
-pub type FullVerifierConfig = FullL2NodeConfig<ClementineConfig>;
 pub type FullFullNodeConfig = FullL2NodeConfig<()>;
 
 pub trait NodeKindMarker {
@@ -64,10 +63,6 @@ impl NodeKindMarker for FullFullNodeConfig {
     const KIND: NodeKind = NodeKind::FullNode;
 }
 
-impl NodeKindMarker for FullVerifierConfig {
-    const KIND: NodeKind = NodeKind::Verifier;
-}
-
 impl<T: Clone + Serialize> Config for FullL2NodeConfig<T>
 where
     FullL2NodeConfig<T>: NodeKindMarker,
@@ -105,6 +100,10 @@ where
     fn rollup_config(&self) -> &RollupConfig {
         &self.rollup
     }
+
+    fn clementine_config(&self) -> &ClementineConfig {
+        unimplemented!()
+    }
 }
 
 impl<T: Clone + Serialize> LogPathProvider for FullL2NodeConfig<T>
@@ -123,3 +122,78 @@ where
         self.dir().join("stderr.log")
     }
 }
+
+#[derive(Clone, Debug)]
+pub struct ClementineNodeConfig<T> {
+    pub node: T,
+    pub config: ClementineConfig,
+    pub docker_image: Option<String>,
+    pub dir: PathBuf,
+    pub env: Vec<(&'static str, &'static str)>,
+}
+
+pub type FullVerifierConfig = ClementineNodeConfig<ClementineConfig>;
+
+impl NodeKindMarker for FullVerifierConfig {
+    const KIND: NodeKind = NodeKind::Verifier;
+}
+
+impl<T: Clone + Serialize> Config for ClementineNodeConfig<T>
+where
+    ClementineNodeConfig<T>: NodeKindMarker,
+{
+    type NodeConfig = T;
+
+    fn dir(&self) -> &PathBuf {
+        &self.dir
+    }
+
+    fn rpc_bind_host(&self) -> &str {
+        &self.config.client.host
+    }
+
+    fn rpc_bind_port(&self) -> u16 {
+        self.config.client.port
+    }
+
+    fn env(&self) -> Vec<(&'static str, &'static str)> {
+        self.env.clone()
+    }
+
+    fn node_config(&self) -> Option<&Self::NodeConfig> {
+        if std::mem::size_of::<T>() == 0 {
+            None
+        } else {
+            Some(&self.node)
+        }
+    }
+
+    fn node_kind() -> NodeKind {
+        <Self as NodeKindMarker>::KIND
+    }
+
+    fn rollup_config(&self) -> &RollupConfig {
+        unimplemented!()
+    }
+
+    fn clementine_config(&self) -> &ClementineConfig {
+        &self.config
+    }
+}
+
+impl<T: Clone + Serialize> LogPathProvider for ClementineNodeConfig<T>
+where
+    ClementineNodeConfig<T>: Config,
+{
+    fn kind() -> NodeKind {
+        Self::node_kind()
+    }
+
+    fn log_path(&self) -> PathBuf {
+        self.dir().join("stdout.log")
+    }
+
+    fn stderr_path(&self) -> PathBuf {
+        self.dir().join("stderr.log")
+    }
+}

src/node.rs

@@ -17,7 +17,7 @@ use tracing::{info, trace};
 
 use crate::{
     client::Client,
-    config::{config_to_file, RollupConfig},
+    config::{config_to_file, ClementineConfig, RollupConfig},
     log_provider::LogPathProvider,
     traits::{NodeT, Restart, SpawnOutput},
     utils::{get_citrea_path, get_genesis_path},
@@ -57,6 +57,7 @@ pub trait Config: Clone {
     fn node_config(&self) -> Option<&Self::NodeConfig>;
     fn node_kind() -> NodeKind;
     fn rollup_config(&self) -> &RollupConfig;
+    fn clementine_config(&self) -> &ClementineConfig;
 }
 
 pub struct Node<C: Config + LogPathProvider> {