Separate batch and light client prover configs

Author: yaziciahmet

Cargo.toml

@@ -26,7 +26,7 @@ bitcoin-da = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", f
 citrea-sequencer = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
 sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["client"] }
 sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
-sov-stf-runner = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d", features = ["native"] }
+sov-stf-runner = { git = "https://github.com/chainwayxyz/citrea", branch = "esad/light-client-starter", features = ["native"] }
 
 [patch.crates-io]
 bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "0ae498d" }

src/config/mod.rs

@@ -14,7 +14,8 @@ pub use docker::DockerConfig;
 pub use rollup::{default_rollup_config, RollupConfig};
 use serde::Serialize;
 pub use sov_stf_runner::{
-    FullNodeConfig, ProverConfig, RollupPublicKeys, RpcConfig, RunnerConfig, StorageConfig,
+    BatchProverConfig, FullNodeConfig, LightClientProverConfig, RollupPublicKeys, RpcConfig,
+    RunnerConfig, StorageConfig,
 };
 pub use test::TestConfig;
 pub use test_case::{TestCaseConfig, TestCaseEnv};
@@ -32,9 +33,9 @@ pub struct FullL2NodeConfig<T> {
 }
 
 pub type FullSequencerConfig = FullL2NodeConfig<SequencerConfig>;
-pub type FullBatchProverConfig = FullL2NodeConfig<ProverConfig>;
+pub type FullBatchProverConfig = FullL2NodeConfig<BatchProverConfig>;
 // TODO: use LightClientProverConfig
-pub type FullLightClientProverConfig = FullL2NodeConfig<ProverConfig>;
+pub type FullLightClientProverConfig = FullL2NodeConfig<LightClientProverConfig>;
 pub type FullFullNodeConfig = FullL2NodeConfig<()>;
 
 pub trait NodeKindMarker {
@@ -49,6 +50,10 @@ impl NodeKindMarker for FullBatchProverConfig {
     const KIND: NodeKind = NodeKind::BatchProver;
 }
 
+impl NodeKindMarker for FullLightClientProverConfig {
+    const KIND: NodeKind = NodeKind::LightClientProver;
+}
+
 impl NodeKindMarker for FullFullNodeConfig {
     const KIND: NodeKind = NodeKind::FullNode;
 }

src/test_case.rs

@@ -23,8 +23,8 @@ use super::{
 };
 use crate::{
     config::{
-        BitcoinServiceConfig, FullLightClientProverConfig, ProverConfig, RpcConfig, RunnerConfig,
-        SequencerConfig, StorageConfig,
+        BatchProverConfig, BitcoinServiceConfig, FullLightClientProverConfig,
+        LightClientProverConfig, RpcConfig, RunnerConfig, SequencerConfig, StorageConfig,
     },
     traits::NodeT,
     utils::{get_default_genesis_path, get_workspace_root},
@@ -191,6 +191,7 @@ impl<T: TestCase> TestCaseRunner<T> {
             include_tx_body: true,
             accept_public_input_as_proven: Some(true),
             sync_blocks_count: 10,
+            pruning_config: None,
         });
 
         let batch_prover_rollup = {
@@ -336,14 +337,14 @@ pub trait TestCase: Send + Sync + 'static {
 
     /// Returns the batch prover configuration for the test.
     /// Override this method to provide a custom batch prover configuration.
-    fn batch_prover_config() -> ProverConfig {
-        ProverConfig::default()
+    fn batch_prover_config() -> BatchProverConfig {
+        BatchProverConfig::default()
     }
 
     /// Returns the light client prover configuration for the test.
     /// Override this method to provide a custom light client prover configuration.
-    fn light_client_prover_config() -> ProverConfig {
-        ProverConfig::default()
+    fn light_client_prover_config() -> LightClientProverConfig {
+        LightClientProverConfig::default()
     }
 
     /// Returns the test setup