Disable scarb 2.10.0 specific tests

commit-id:3ae67c8b

Author: cptartur

.github/workflows/ci.yml

@@ -44,14 +44,6 @@ jobs:
       - uses: software-mansion/setup-scarb@v1
       - uses: software-mansion/setup-universal-sierra-compiler@v1
       - run: cargo test --release --lib -p forge
-      # TODO(#3096): Remove running tests with `scarb_since_2_10`
-      - uses: software-mansion/setup-scarb@v1
-        with:
-          scarb-version: "2.10.1"
-      - name: Check and lint forge templates
-        run: cargo test --release -p forge --features scarb_since_2_10 validate_templates
-      - name: Check and lint snforge_std
-        run: cargo test --release -p forge --features scarb_since_2_10 validate_snforge_std
 
   build-test-forge-nextest-archive:
     needs: setup
@@ -166,21 +158,6 @@ jobs:
       - run: cargo test --package forge --features scarb_2_9_1 --lib compatibility_check::tests::warning_requirements
       - run: cargo test --package forge --features scarb_2_9_1 --test main e2e::running::sierra_gas_with_older_scarb
 
-  # todo(3096): Remove this and the feature as soon as scarb 2.10 is the oldest officially supported version
-  test-scarb-since-2-10:
-    name: Test scarb 2.10
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
-      - uses: software-mansion/setup-scarb@v1
-        with:
-          scarb-version: "2.10.1"
-      - uses: software-mansion/setup-universal-sierra-compiler@v1
-
-      - run: cargo test --package forge --features scarb_since_2_10 sierra_gas
-
   test-forge-runner:
     name: Test Forge Runner
     runs-on: ubuntu-latest
@@ -284,12 +261,7 @@ jobs:
       - uses: software-mansion/setup-universal-sierra-compiler@v1
       - name: Run tests
         run: cargo test --release -p sncast
-      # TODO(#3096): Remove running tests with `scarb_since_2_10`
-      - uses: software-mansion/setup-scarb@v1
-        with:
-          scarb-version: "2.10.1"
       - name: Check and lint sncast_std
-        run: cargo test --release -p sncast --features scarb_since_2_10 validate_sncast_std
 
   test-conversions:
     name: Test Conversions

crates/forge/Cargo.toml

@@ -8,7 +8,6 @@ edition.workspace = true
 [features]
 smoke = []
 scarb_2_9_1 = []
-scarb_since_2_10 = []
 no_scarb_installed = []
 debugging = []
 assert_non_exact_gas = ["test_utils/assert_non_exact_gas"]

crates/forge/tests/e2e/running.rs

@@ -861,7 +861,6 @@ fn detailed_resources_flag() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn detailed_resources_flag_sierra_gas() {
     let temp = setup_package("erc20_package");
     let output = test_runner(&temp)

crates/forge/tests/integration/gas.rs

@@ -1008,7 +1008,6 @@ fn events_contract_cost_cairo_steps() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn declare_cost_is_omitted_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1044,7 +1043,6 @@ fn declare_cost_is_omitted_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn deploy_syscall_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1093,7 +1091,6 @@ fn deploy_syscall_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn snforge_std_deploy_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1134,7 +1131,6 @@ fn snforge_std_deploy_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn keccak_cost_sierra_gas() {
     let test = test_case!(indoc!(
         r"
@@ -1164,7 +1160,6 @@ fn keccak_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn contract_keccak_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1214,7 +1209,6 @@ fn contract_keccak_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn contract_range_check_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1260,7 +1254,6 @@ fn contract_range_check_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn storage_write_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1312,7 +1305,6 @@ fn storage_write_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn multiple_storage_writes_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1371,7 +1363,6 @@ fn multiple_storage_writes_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn l1_message_cost_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1422,7 +1413,6 @@ fn l1_message_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn l1_message_cost_for_proxy_sierra_gas() {
     let test = test_case!(
         indoc!(
@@ -1487,7 +1477,6 @@ fn l1_message_cost_for_proxy_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn events_cost_sierra_gas() {
     let test = test_case!(indoc!(
         r"
@@ -1534,7 +1523,6 @@ fn events_cost_sierra_gas() {
 }
 
 #[test]
-#[cfg_attr(not(feature = "scarb_since_2_10"), ignore)]
 fn events_contract_cost_sierra_gas() {
     let test = test_case!(
         indoc!(

crates/sncast/Cargo.toml

@@ -71,7 +71,6 @@ packages_validation = { path = "../testing/packages_validation" }
 
 [features]
 default = []
-scarb_since_2_10 = ["packages_validation/scarb_since_2_10"]
 
 [[bin]]
 name = "sncast"

crates/testing/packages_validation/Cargo.toml

@@ -12,6 +12,3 @@ project-root.workspace = true
 
 [dev-dependencies]
 test-case.workspace = true
-
-[features]
-scarb_since_2_10 = []

crates/testing/packages_validation/src/lib.rs

@@ -16,26 +16,23 @@ pub fn check_and_lint(package_path: &Utf8PathBuf) {
         "`scarb check` failed in {package_path}",
     );
 
-    // TODO(#3149)
-    if cfg!(feature = "scarb_since_2_10") {
-        let lint_output = ScarbCommand::new()
-            .current_dir(package_path)
-            .arg("lint")
-            .command()
-            .stdout(Stdio::inherit())
-            .stderr(Stdio::inherit())
-            .output()
-            .expect("Failed to run `scarb lint`");
-        assert!(
-            lint_output.status.success(),
-            "`scarb lint` failed in {package_path}"
-        );
+    let lint_output = ScarbCommand::new()
+        .current_dir(package_path)
+        .arg("lint")
+        .command()
+        .stdout(Stdio::inherit())
+        .stderr(Stdio::inherit())
+        .output()
+        .expect("Failed to run `scarb lint`");
+    assert!(
+        lint_output.status.success(),
+        "`scarb lint` failed in {package_path}"
+    );
 
-        // TODO(#3212): Once out minimal supported scarb version is 2.12.0, we should
-        // check status instead of checking if stdout is not empty
-        assert!(
-            lint_output.stdout.is_empty(),
-            "`scarb lint` output should be empty"
-        );
-    }
+    // TODO(#3212): Once out minimal supported scarb version is 2.12.0, we should
+    // check status instead of checking if stdout is not empty
+    assert!(
+        lint_output.stdout.is_empty(),
+        "`scarb lint` output should be empty"
+    );
 }