diff --git a/config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json b/config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json index 6a513462a82..a8c3dabfcce 100644 --- a/config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json +++ b/config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json @@ -13,7 +13,7 @@ "batcher_config.block_builder_config.execute_config.concurrency_config.enabled": true, "batcher_config.block_builder_config.execute_config.concurrency_config.n_workers": 4, "batcher_config.block_builder_config.execute_config.stack_size": 62914560, - "batcher_config.block_builder_config.tx_chunk_size": 100, + "batcher_config.block_builder_config.tx_chunk_size": 3, "batcher_config.block_builder_config.tx_polling_interval_millis": 100, "batcher_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000, "batcher_config.contract_class_manager_config.cairo_native_run_config.native_classes_whitelist": "All", diff --git a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_positive_flow.rs b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_positive_flow.rs index 5803799e286..29c7ab0892b 100644 --- a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_positive_flow.rs +++ b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_positive_flow.rs @@ -7,7 +7,7 @@ use tracing::info; #[tokio::main] async fn main() { integration_test_setup("positive").await; - const BLOCK_TO_WAIT_FOR: BlockNumber = BlockNumber(15); + const BLOCK_TO_WAIT_FOR: BlockNumber = BlockNumber(30); const N_INVOKE_TXS: usize = 50; const N_L1_HANDLER_TXS: usize = 2; /// The number of consolidated local sequencers that participate in the test. diff --git a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_restart_flow.rs b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_restart_flow.rs index c0681d4406c..a8e5b98ba15 100644 --- a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_restart_flow.rs +++ b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_restart_flow.rs @@ -19,7 +19,7 @@ use tracing::info; async fn main() { integration_test_setup("restart").await; const TOTAL_PHASES: u64 = 4; - const PHASE_DURATION: Duration = Duration::from_secs(45); + const PHASE_DURATION: Duration = Duration::from_secs(30); const TOTAL_DURATION: u64 = PHASE_DURATION.as_secs() * TOTAL_PHASES; const TOTAL_INVOKE_TXS: u64 = TPS * TOTAL_DURATION; /// The number of consolidated local sequencers that participate in the test. @@ -112,7 +112,7 @@ async fn main() { "Awaiting transactions after node {RESTART_NODE} was restarted and before node \ {SHUTDOWN_NODE} is shut down" ); - sleep(PHASE_DURATION).await; + sleep(PHASE_DURATION * 3).await; verify_running_nodes_received_more_txs( &mut nodes_accepted_txs_mapping, &integration_test_manager, @@ -129,7 +129,7 @@ async fn main() { "Awaiting transactions while node {RESTART_NODE} is up and node {SHUTDOWN_NODE} is \ down" ); - sleep(PHASE_DURATION).await; + sleep(PHASE_DURATION * 3).await; verify_running_nodes_received_more_txs( &mut nodes_accepted_txs_mapping, &integration_test_manager, diff --git a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_revert_flow.rs b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_revert_flow.rs index d79be97bbef..a64094bccbe 100644 --- a/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_revert_flow.rs +++ b/crates/apollo_integration_tests/src/bin/sequencer_node_end_to_end_integration_tests/integration_test_revert_flow.rs @@ -13,9 +13,9 @@ use tracing::info; #[tokio::main] async fn main() { integration_test_setup("revert").await; - const BLOCK_TO_REVERT_FROM: BlockNumber = BlockNumber(15); + const BLOCK_TO_REVERT_FROM: BlockNumber = BlockNumber(30); const REVERT_UP_TO_AND_INCLUDING: BlockNumber = BlockNumber(1); - const BLOCK_TO_WAIT_FOR_AFTER_REVERT: BlockNumber = BlockNumber(20); + const BLOCK_TO_WAIT_FOR_AFTER_REVERT: BlockNumber = BlockNumber(40); // can't use static assertion as comparison is non const. assert!(REVERT_UP_TO_AND_INCLUDING < BLOCK_TO_REVERT_FROM); assert!(BLOCK_TO_REVERT_FROM < BLOCK_TO_WAIT_FOR_AFTER_REVERT); diff --git a/crates/apollo_integration_tests/src/integration_test_manager.rs b/crates/apollo_integration_tests/src/integration_test_manager.rs index 0503bbb7e0f..80a29ae69e2 100644 --- a/crates/apollo_integration_tests/src/integration_test_manager.rs +++ b/crates/apollo_integration_tests/src/integration_test_manager.rs @@ -81,9 +81,9 @@ use crate::utils::{ pub const DEFAULT_SENDER_ACCOUNT: AccountId = 0; const BLOCK_MAX_CAPACITY_N_STEPS: GasAmount = GasAmount(30000000); -pub const BLOCK_TO_WAIT_FOR_DEPLOY_AND_INVOKE: BlockNumber = BlockNumber(2); +pub const BLOCK_TO_WAIT_FOR_DEPLOY_AND_INVOKE: BlockNumber = BlockNumber(4); pub const BLOCK_TO_WAIT_FOR_DECLARE: BlockNumber = - BlockNumber(BLOCK_TO_WAIT_FOR_DEPLOY_AND_INVOKE.0 + 5); + BlockNumber(BLOCK_TO_WAIT_FOR_DEPLOY_AND_INVOKE.0 + 10); pub const HTTP_PORT_ARG: &str = "http-port"; pub const MONITORING_PORT_ARG: &str = "monitoring-port"; diff --git a/crates/apollo_integration_tests/src/utils.rs b/crates/apollo_integration_tests/src/utils.rs index 33577acdbe3..b6e30e192d5 100644 --- a/crates/apollo_integration_tests/src/utils.rs +++ b/crates/apollo_integration_tests/src/utils.rs @@ -79,9 +79,9 @@ pub const ACCOUNT_ID_0: AccountId = 0; pub const ACCOUNT_ID_1: AccountId = 1; pub const NEW_ACCOUNT_SALT: ContractAddressSalt = ContractAddressSalt(Felt::THREE); pub const UNDEPLOYED_ACCOUNT_ID: AccountId = 2; -// Transactions per second sent to the gateway. This rate makes each block contain ~10 transactions +// Transactions per second sent to the gateway. This rate makes each block contain ~25 transactions // with the set [TimeoutsConfig] . -pub const TPS: u64 = 2; +pub const TPS: u64 = 5; pub const N_TXS_IN_FIRST_BLOCK: usize = 2; pub type CreateRpcTxsFn = fn(&mut MultiAccountTransactionGenerator) -> Vec; @@ -554,6 +554,7 @@ pub fn create_batcher_config( }, }, execute_config: TransactionExecutorConfig::create_for_testing(concurrency_enabled), + tx_chunk_size: 3, ..Default::default() }, #[cfg(feature = "cairo_native")] diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 6a5ca94ca6a..1edc7ea0664 100755 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -2,6 +2,7 @@ import argparse from enum import Enum +import os import subprocess from typing import List, Set, Optional from tests_utils import ( @@ -114,7 +115,10 @@ def test_crates(crates: Set[str], base_command: BaseCommand, is_nightly: bool): print("Executing test commands...") for cmd in cmds: print(cmd, flush=True) - subprocess.run(cmd, check=True) + # Copy current environment and add new variable + env = os.environ.copy() + env["RUST_LOG"] = "debug" + subprocess.run(cmd, check=True, env=env) print("Tests complete.")