From e60165c68a5d06f7852a8789bee446db77206077 Mon Sep 17 00:00:00 2001 From: Maksymilian Kowalski Date: Wed, 22 Apr 2026 22:31:34 +0200 Subject: [PATCH 1/2] Remove scarb `2.14.0` check in gas test --- crates/forge/tests/integration/gas.rs | 41 ++++++++------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/crates/forge/tests/integration/gas.rs b/crates/forge/tests/integration/gas.rs index 629ddae298..8e3e00dd36 100644 --- a/crates/forge/tests/integration/gas.rs +++ b/crates/forge/tests/integration/gas.rs @@ -3,8 +3,6 @@ use crate::utils::running_tests::run_test_case; use crate::utils::test_case; use forge_runner::forge_config::ForgeTrackedResource; use indoc::{formatdoc, indoc}; -use scarb_api::version::scarb_version; -use semver::Version; use shared::test_utils::node_url::node_rpc_url; use starknet_api::execution_resources::{GasAmount, GasVector}; use std::path::Path; @@ -271,33 +269,18 @@ fn contract_range_check_cost_cairo_steps() { assert_passed(&result); - let scarb_version = scarb_version().expect("Failed to get scarb version").scarb; - - // TODO(#4087): Remove this when bumping minimal recommended Scarb version to 2.14.0 - if scarb_version >= Version::new(2, 14, 0) { - // 96 = cost of deploy (see snforge_std_deploy_cost test) - // 43 = cost of 1052 range check builtins (because int(0.04 * 1052) = 43) - // 0 l1_gas + 96 l1_data_gas + 43 * (100 / 0.0025) l2 gas - assert_gas( - &result, - "contract_range_check_cost", - GasVector { - l1_gas: GasAmount(0), - l1_data_gas: GasAmount(96), - l2_gas: GasAmount(1_720_000), - }, - ); - } else { - assert_gas( - &result, - "contract_range_check_cost", - GasVector { - l1_gas: GasAmount(0), - l1_data_gas: GasAmount(96), - l2_gas: GasAmount(6_520_000), - }, - ); - } + // 96 = cost of deploy (see snforge_std_deploy_cost test) + // 43 = cost of 1052 range check builtins (because int(0.04 * 1052) = 43) + // 0 l1_gas + 96 l1_data_gas + 43 * (100 / 0.0025) l2 gas + assert_gas( + &result, + "contract_range_check_cost", + GasVector { + l1_gas: GasAmount(0), + l1_data_gas: GasAmount(96), + l2_gas: GasAmount(1_720_000), + }, + ); } #[test] From 08292dcaa18d7284f698d1c15e6ab72288eac78f Mon Sep 17 00:00:00 2001 From: Maksymilian Kowalski Date: Thu, 23 Apr 2026 12:56:47 +0200 Subject: [PATCH 2/2] Remove `scarb_version` check in init --- crates/sncast/tests/e2e/script/init.rs | 63 ++++++++------------------ 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/crates/sncast/tests/e2e/script/init.rs b/crates/sncast/tests/e2e/script/init.rs index 861c1103bf..1590754e67 100644 --- a/crates/sncast/tests/e2e/script/init.rs +++ b/crates/sncast/tests/e2e/script/init.rs @@ -2,15 +2,11 @@ use crate::helpers::runner::runner; use camino::Utf8PathBuf; use indoc::{formatdoc, indoc}; use scarb_api::ScarbCommand; -use scarb_api::version::scarb_version; -use semver::Version; use shared::test_utils::output_assert::{assert_stderr_contains, assert_stdout_contains}; use sncast::helpers::constants::INIT_SCRIPTS_DIR; use sncast::helpers::scarb_utils::get_cairo_version; use tempfile::TempDir; -const SCARB_2_14_0: Version = Version::new(2, 14, 0); - #[test] fn test_script_init_happy_case() { let script_name = "my_script"; @@ -38,45 +34,26 @@ fn test_script_init_happy_case() { let scarb_toml_path = Utf8PathBuf::from_path_buf(scarb_toml_path).unwrap(); let cairo_version = get_cairo_version(&scarb_toml_path).unwrap(); - let scarb_version = scarb_version().unwrap().scarb; - - let expected_scarb_toml = if scarb_version >= SCARB_2_14_0 { - formatdoc!( - r#" - [package] - name = "{script_name}" - version = "0.1.0" - edition = [..] - - # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html - - [executable] - - [cairo] - enable-gas = false - - [dependencies] - cairo_execute = "{cairo_version}" - sncast_std = "{cast_version}" - starknet = ">={cairo_version}" - "# - ) - } else { - formatdoc!( - r#" - [package] - name = "{script_name}" - version = "0.1.0" - edition = [..] - - # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html - - [dependencies] - sncast_std = "{cast_version}" - starknet = ">={cairo_version}" - "# - ) - }; + let expected_scarb_toml = formatdoc!( + r#" + [package] + name = "{script_name}" + version = "0.1.0" + edition = [..] + + # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html + + [executable] + + [cairo] + enable-gas = false + + [dependencies] + cairo_execute = "{cairo_version}" + sncast_std = "{cast_version}" + starknet = ">={cairo_version}" + "# + ); snapbox::assert_data_eq!(scarb_toml_content, expected_scarb_toml);