From 5fd688bd1d15ca335722a77659352c8d17afdf4b Mon Sep 17 00:00:00 2001 From: Itay Tsabary <itayt@starkware.co> Date: Mon, 25 Nov 2024 12:03:09 +0200 Subject: [PATCH] chore(sequencer_node): replace run node shell command commit-id:3dd1cf11 --- Cargo.lock | 1 + crates/starknet_integration_tests/Cargo.toml | 1 + .../tests/end_to_end_integration_test.rs | 29 +++++++++---------- .../src/test_utils/compilation.rs | 7 ++++- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6761cdfd8c1..e476f0c1349 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10438,6 +10438,7 @@ dependencies = [ "cairo-lang-starknet-classes", "futures", "indexmap 2.6.0", + "infra_utils", "mempool_test_utils", "papyrus_common", "papyrus_consensus", diff --git a/crates/starknet_integration_tests/Cargo.toml b/crates/starknet_integration_tests/Cargo.toml index 2a77b40534c..8b3b43ef64d 100644 --- a/crates/starknet_integration_tests/Cargo.toml +++ b/crates/starknet_integration_tests/Cargo.toml @@ -46,6 +46,7 @@ tracing.workspace = true [dev-dependencies] futures.workspace = true +infra_utils.workspace = true pretty_assertions.workspace = true rstest.workspace = true starknet_sequencer_infra.workspace = true diff --git a/crates/starknet_integration_tests/tests/end_to_end_integration_test.rs b/crates/starknet_integration_tests/tests/end_to_end_integration_test.rs index 1602e1f87cd..d2af0e5e309 100644 --- a/crates/starknet_integration_tests/tests/end_to_end_integration_test.rs +++ b/crates/starknet_integration_tests/tests/end_to_end_integration_test.rs @@ -1,8 +1,9 @@ -use std::env; use std::path::PathBuf; use std::process::Stdio; use std::time::Duration; +use infra_utils::command::create_shell_command; +use infra_utils::path::resolve_project_relative_path; use mempool_test_utils::starknet_api_test_utils::{AccountId, MultiAccountTransactionGenerator}; use papyrus_execution::execution_utils::get_nonce_at; use papyrus_storage::state::StateStorageReader; @@ -14,8 +15,9 @@ use starknet_api::state::StateNumber; use starknet_integration_tests::integration_test_setup::IntegrationTestSetup; use starknet_integration_tests::utils::{create_integration_test_tx_generator, send_account_txs}; use starknet_sequencer_infra::trace_util::configure_tracing; +use starknet_sequencer_node::test_utils::compilation::{compile_node_result, NODE_EXECUTABLE_PATH}; use starknet_types_core::felt::Felt; -use tokio::process::{Child, Command}; +use tokio::process::Child; use tokio::task::{self, JoinHandle}; use tokio::time::interval; use tracing::{error, info}; @@ -27,19 +29,16 @@ fn tx_generator() -> MultiAccountTransactionGenerator { // TODO(Tsabary): Move to a suitable util location. async fn spawn_node_child_task(node_config_path: PathBuf) -> Child { - // Get the current working directory for the project - let project_path = env::current_dir().expect("Failed to get current directory").join("../.."); - // TODO(Tsabary): Capture output to a log file, and present it in case of a failure. - // TODO(Tsabary): Change invocation from "cargo run" to separate compilation and invocation - // (build, and then invoke the binary). - Command::new("cargo") - .arg("run") - .arg("--bin") - .arg("starknet_sequencer_node") - .arg("--quiet") - .current_dir(&project_path) - .arg("--") + info!("Compiling the node."); + compile_node_result().await.expect("Failed to compile the sequencer node."); + let node_executable = resolve_project_relative_path(NODE_EXECUTABLE_PATH) + .expect("Node executable should be available") + .to_string_lossy() + .to_string(); + + info!("Running the node from: {}", node_executable); + create_shell_command(node_executable.as_str()) .arg("--config_file") .arg(node_config_path.to_str().unwrap()) .stderr(Stdio::inherit()) @@ -133,7 +132,7 @@ async fn test_end_to_end_integration(mut tx_generator: MultiAccountTransactionGe let node_run_handle = spawn_run_node(integration_test_setup.node_config_path).await; // Wait for the node to start. - match integration_test_setup.is_alive_test_client.await_alive(Duration::from_secs(5), 30).await + match integration_test_setup.is_alive_test_client.await_alive(Duration::from_secs(5), 50).await { Ok(_) => {} Err(_) => panic!("Node is not alive."), diff --git a/crates/starknet_sequencer_node/src/test_utils/compilation.rs b/crates/starknet_sequencer_node/src/test_utils/compilation.rs index c89d62d397f..5975f44073e 100644 --- a/crates/starknet_sequencer_node/src/test_utils/compilation.rs +++ b/crates/starknet_sequencer_node/src/test_utils/compilation.rs @@ -4,6 +4,8 @@ use std::process::{ExitStatus, Stdio}; use infra_utils::command::create_shell_command; use tracing::info; +pub const NODE_EXECUTABLE_PATH: &str = "target/debug/starknet_sequencer_node"; + #[cfg(test)] #[path = "compilation_test.rs"] mod compilation_test; @@ -18,7 +20,10 @@ pub enum NodeCompilationError { /// Compiles the node using `cargo build` for testing purposes. async fn compile_node() -> io::Result<ExitStatus> { - info!("Compiling the starknet_sequencer_node binary"); + info!( + "Compiling the starknet_sequencer_node binary, expected destination: \ + {NODE_EXECUTABLE_PATH}" + ); // Run `cargo build` to compile the project let compilation_result = create_shell_command("cargo")