Remove supports-panic-backtrace test condition

commit-id:9d3bc55c

Author: ddoktorski

.github/workflows/ci.yml

@@ -206,20 +206,6 @@ jobs:
       - name: Run Forge Debugging tests
         run: cargo test --release -p forge --features debugging --test main e2e::debugging
 
-  test-forge-backtrace:
-    name: Test Forge Backtrace - support for `panic-backtrace` in Scarb.toml
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: software-mansion/setup-scarb@v1
-        with:
-          scarb-version: "nightly-2025-03-27"
-      - uses: software-mansion/setup-universal-sierra-compiler@58146c4184fa6ec5e8aaf02309ab85e35f782ed0 # v1.0.0
-      - name: Run Forge Debugging tests
-        run: cargo test --release -p forge --features supports-panic-backtrace --test main e2e::backtrace
-
   test-forge-scarb-plugin:
     name: Test Forge Scarb Plugin
     runs-on: ubuntu-latest

crates/forge/Cargo.toml

@@ -12,7 +12,6 @@ no_scarb_installed = []
 debugging = []
 assert_non_exact_gas = ["test_utils/assert_non_exact_gas"]
 skip_plugin_checks = []
-supports-panic-backtrace = []
 interact-with-state = []
 
 [dependencies]

crates/forge/tests/e2e/backtrace.rs

@@ -4,6 +4,7 @@ use assert_fs::fixture::{FileWriteStr, PathChild};
 use indoc::indoc;
 use shared::test_utils::output_assert::{AsOutput, assert_stdout_contains};
 use std::fs;
+use test_utils::use_snforge_std_compatibility;
 use toml_edit::{DocumentMut, value};
 
 #[test]
@@ -178,38 +179,79 @@ fn test_backtrace_panic() {
         .assert()
         .failure();
 
-    if cfg!(feature = "supports-panic-backtrace") {
+    if use_snforge_std_compatibility() {
+        assert_stdout_contains(
+            output,
+            indoc! {
+               "[FAIL] backtrace_panic::Test::test_contract_panics
+
+                Failure data:
+                    0x417373657274206661696c6564 ('Assert failed')
+
+                error occurred in contract 'InnerContract'
+                stack backtrace:
+                   0: backtrace_panic::InnerContract::__wrapper__InnerContract__inner
+                       at [..]lib.cairo:34:9
+
+                error occurred in contract 'OuterContract'
+                stack backtrace:
+                   0: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
+                       at [..]lib.cairo:15:9
+
+                [FAIL] backtrace_panic::Test::test_fork_contract_panics
+
+                Failure data:
+                    0x417373657274206661696c6564 ('Assert failed')
+
+                error occurred in forked contract with class hash: 0x554cb276fb5eb0788344f5431b9a166e2f445d8a91c7aef79d8c77e7eede956
+
+                error occurred in contract 'OuterContract'
+                stack backtrace:
+                   0: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
+                       at [..]lib.cairo:15:9"
+            },
+        );
+    } else {
         assert_stdout_contains(
             output,
             indoc! {
                "Failure data:
                     0x417373657274206661696c6564 ('Assert failed')
                 error occurred in contract 'InnerContract'
                 stack backtrace:
-                   0: (inlined) core::array::ArrayImpl::append
-                       at [..]array.cairo:135:9
-                   1: core::array_inline_macro
-                       at [..]lib.cairo:364:11
+                   0: core::panic_with_const_felt252
+                       at [..]lib.cairo:364:5
+                   1: core::panic_with_const_felt252
+                       at [..]lib.cairo:364:5
                    2: (inlined) core::Felt252PartialEq::eq
                        at [..]lib.cairo:231:9
                    3: (inlined) backtrace_panic::InnerContract::inner_call
-                       at [..]traits.cairo:442:10
+                       at [..]traits.cairo:441:10
                    4: (inlined) backtrace_panic::InnerContract::InnerContract::inner
                        at [..]lib.cairo:40:16
                    5: backtrace_panic::InnerContract::__wrapper__InnerContract__inner
                        at [..]lib.cairo:35:13
 
                 error occurred in contract 'OuterContract'
                 stack backtrace:
-                   0: (inlined) backtrace_panic::IInnerContractDispatcherImpl::inner
-                       at [..]lib.cairo:22:1
-                   1: (inlined) backtrace_panic::OuterContract::OuterContract::outer
-                       at [..]lib.cairo:17:13
-                   2: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
+                   0: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
                        at [..]lib.cairo:15:9"
             },
         );
-    } else {
+    }
+}
+
+#[test]
+fn test_backtrace_panic_without_inlines() {
+    let temp = setup_package("backtrace_panic");
+    without_inlines(&temp);
+
+    let output = test_runner(&temp)
+        .env("SNFORGE_BACKTRACE", "1")
+        .assert()
+        .failure();
+
+    if use_snforge_std_compatibility() {
         assert_stdout_contains(
             output,
             indoc! {
@@ -241,20 +283,7 @@ fn test_backtrace_panic() {
                        at [..]lib.cairo:15:9"
             },
         );
-    }
-}
-
-#[test]
-fn test_backtrace_panic_without_inlines() {
-    let temp = setup_package("backtrace_panic");
-    without_inlines(&temp);
-
-    let output = test_runner(&temp)
-        .env("SNFORGE_BACKTRACE", "1")
-        .assert()
-        .failure();
-
-    if cfg!(feature = "supports-panic-backtrace") {
+    } else {
         assert_stdout_contains(
             output,
             indoc! {
@@ -306,43 +335,10 @@ fn test_backtrace_panic_without_inlines() {
                        at [..]lib.cairo:15:9"
             },
         );
-    } else {
-        assert_stdout_contains(
-            output,
-            indoc! {
-               "[FAIL] backtrace_panic::Test::test_contract_panics
-
-                Failure data:
-                    0x417373657274206661696c6564 ('Assert failed')
-                
-                error occurred in contract 'InnerContract'
-                stack backtrace:
-                   0: backtrace_panic::InnerContract::__wrapper__InnerContract__inner
-                       at [..]lib.cairo:34:9
-                
-                error occurred in contract 'OuterContract'
-                stack backtrace:
-                   0: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
-                       at [..]lib.cairo:15:9
-                
-                [FAIL] backtrace_panic::Test::test_fork_contract_panics
-                
-                Failure data:
-                    0x417373657274206661696c6564 ('Assert failed')
-                
-                error occurred in forked contract with class hash: 0x554cb276fb5eb0788344f5431b9a166e2f445d8a91c7aef79d8c77e7eede956
-                
-                error occurred in contract 'OuterContract'
-                stack backtrace:
-                   0: backtrace_panic::OuterContract::__wrapper__OuterContract__outer
-                       at [..]lib.cairo:15:9"
-            },
-        );
     }
 }
 
 #[test]
-#[cfg_attr(not(feature = "supports-panic-backtrace"), ignore)]
 fn test_handled_error_not_display() {
     let temp = setup_package("dispatchers");
 
@@ -364,10 +360,10 @@ fn test_handled_error_not_display() {
         indoc! {"
             error occurred in contract 'ErrorHandler'
             stack backtrace:
-               0: (inlined) core::array::ArrayImpl::append
-                   at [..]array.cairo:135:9
-               1: core::array_inline_macro
-                   at [..]lib.cairo:364:11
+               0: core::panic_with_const_felt252
+                   at [..]lib.cairo:364:5
+               1: core::panic_with_const_felt252
+                   at [..]lib.cairo:364:5
                2: dispatchers::error_handler::ErrorHandler::ErrorHandler::catch_panic_and_fail
                    at [..]error_handler.cairo:50:21
                3: dispatchers::error_handler::ErrorHandler::__wrapper__ErrorHandler__catch_panic_and_fail