Move max_block_size to test configuration

informalsystems · Feb 11, 2025 · b4bd237 · b4bd237
1 parent 88b4193
commit b4bd237
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/code/crates/config/src/lib.rs b/code/crates/config/src/lib.rs
@@ -379,9 +379,6 @@ impl Default for SyncConfig {
 /// Consensus configuration options
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub struct ConsensusConfig {
-    /// Max block size
-    pub max_block_size: ByteSize,
-
     /// Timeouts
     #[serde(flatten)]
     pub timeouts: TimeoutConfig,
@@ -547,6 +544,7 @@ pub struct VoteExtensionsConfig {
 
 #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct TestConfig {
+    pub max_block_size: ByteSize,
     pub tx_size: ByteSize,
     pub txs_per_part: usize,
     pub time_allowance_factor: f32,
@@ -560,6 +558,7 @@ pub struct TestConfig {
 impl Default for TestConfig {
     fn default() -> Self {
         Self {
+            max_block_size: ByteSize::mib(1),
             tx_size: ByteSize::kib(1),
             txs_per_part: 256,
             time_allowance_factor: 0.5,

diff --git a/code/crates/starknet/host/src/spawn.rs b/code/crates/starknet/host/src/spawn.rs
@@ -329,7 +329,7 @@ async fn spawn_host_actor(
 
     let mock_params = StarknetParams {
         value_payload,
-        max_block_size: cfg.consensus.max_block_size,
+        max_block_size: cfg.test.max_block_size,
         tx_size: cfg.test.tx_size,
         txs_per_part: cfg.test.txs_per_part,
         time_allowance_factor: cfg.test.time_allowance_factor,

diff --git a/code/crates/starknet/test/src/lib.rs b/code/crates/starknet/test/src/lib.rs
@@ -93,8 +93,8 @@ impl TestParams {
     fn apply_to_config(&self, config: &mut Config) {
         config.sync.enabled = self.enable_sync;
         config.consensus.p2p.protocol = self.protocol;
-        config.consensus.max_block_size = self.block_size;
         config.consensus.value_payload = self.value_payload;
+        config.test.max_block_size = self.block_size;
         config.test.tx_size = self.tx_size;
         config.test.txs_per_part = self.txs_per_part;
         config.test.vote_extensions.enabled = self.vote_extensions.is_some();
@@ -718,7 +718,6 @@ pub fn make_node_config<S>(test: &Test<S>, i: usize) -> NodeConfig {
         moniker: format!("node-{}", test.nodes[i].id),
         logging: LoggingConfig::default(),
         consensus: ConsensusConfig {
-            max_block_size: ByteSize::mib(1),
             value_payload: ValuePayload::default(),
             timeouts: TimeoutConfig::default(),
             p2p: P2pConfig {

diff --git a/code/crates/test/cli/src/cmd/distributed_testnet.rs b/code/crates/test/cli/src/cmd/distributed_testnet.rs
@@ -3,7 +3,6 @@
 use std::path::Path;
 use std::time::Duration;
 
-use bytesize::ByteSize;
 use clap::Parser;
 use color_eyre::eyre::{eyre, Result};
 use itertools::Itertools;
@@ -227,7 +226,6 @@ fn generate_distributed_config(
     Config {
         moniker: format!("test-{}", index),
         consensus: ConsensusConfig {
-            max_block_size: ByteSize::mib(1),
             value_payload: ValuePayload::default(),
             timeouts: TimeoutConfig::default(),
             p2p: P2pConfig {

diff --git a/code/crates/test/cli/src/new.rs b/code/crates/test/cli/src/new.rs
@@ -2,7 +2,6 @@
 
 use std::time::Duration;
 
-use bytesize::ByteSize;
 use itertools::Itertools;
 use rand::prelude::StdRng;
 use rand::rngs::OsRng;
@@ -83,7 +82,6 @@ pub fn generate_config(
     Config {
         moniker: format!("test-{}", index),
         consensus: ConsensusConfig {
-            max_block_size: ByteSize::mib(1),
             value_payload: ValuePayload::default(),
             timeouts: TimeoutConfig::default(),
             p2p: P2pConfig {

diff --git a/code/crates/test/framework/src/lib.rs b/code/crates/test/framework/src/lib.rs
@@ -90,8 +90,8 @@ impl TestParams {
     fn apply_to_config(&self, config: &mut Config) {
         config.sync.enabled = self.enable_sync;
         config.consensus.p2p.protocol = self.protocol;
-        config.consensus.max_block_size = self.block_size;
         config.consensus.value_payload = self.value_payload;
+        config.test.max_block_size = self.block_size;
         config.test.tx_size = self.tx_size;
         config.test.txs_per_part = self.txs_per_part;
         config.test.vote_extensions.enabled = self.vote_extensions.is_some();
@@ -717,7 +717,6 @@ pub fn make_node_config<S>(test: &Test<S>, i: usize) -> NodeConfig {
         moniker: format!("node-{}", test.nodes[i].id),
         logging: LoggingConfig::default(),
         consensus: ConsensusConfig {
-            max_block_size: ByteSize::mib(1),
             value_payload: ValuePayload::default(),
             timeouts: TimeoutConfig::default(),
             p2p: P2pConfig {