Merge branch 'feat/bump-snforge-to-0.51.0' into feat/remove-coverage-incompatible-feature-#1523

ericnordelo · ericnordelo · commit dc365049cca8 · 2025-10-23T13:42:11.000+02:00
diff --git a/Scarb.lock b/Scarb.lock
@@ -189,15 +189,15 @@ dependencies = [
 
 [[package]]
 name = "snforge_scarb_plugin"
-version = "0.50.0"
+version = "0.51.1"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:8c29e5519362d22f2c802e4e348da846de3898cbaeac19b58aded6a009bf188e"
+checksum = "sha256:6783f6990b19ec24f757381e99938d5966df1e7c734ec45e2c7c8133207c8624"
 
 [[package]]
 name = "snforge_std"
-version = "0.50.0"
+version = "0.51.1"
 source = "registry+https://scarbs.xyz/"
-checksum = "sha256:db3a9de47952c699f8f3ce649b5b01f09c1f9c170f38b3c7a8df8e50a0188e9b"
+checksum = "sha256:5af23a16bc9d7067cfe99bbbe69118773eb7cc9411b2051513c7c1c6995e57a1"
 dependencies = [
  "snforge_scarb_plugin",
 ]
diff --git a/Scarb.toml b/Scarb.toml
@@ -27,8 +27,8 @@ edition.workspace = true
 [workspace.package]
 version = "3.0.0-alpha.3"
 edition = "2024_07"
-cairo-version = "2.12.0"
-scarb-version = "2.12.0"
+cairo-version = "2.12.2"
+scarb-version = "2.12.2"
 authors = ["OpenZeppelin Community <maintainers@openzeppelin.org>"]
 description = "OpenZeppelin Contracts written in Cairo for Starknet, a decentralized ZK Rollup"
 documentation = "https://docs.openzeppelin.com/contracts-cairo"
@@ -45,7 +45,7 @@ keywords = [
 [workspace.dependencies]
 assert_macros = "2.12.2"
 starknet = "2.12.2"
-snforge_std = "0.50.0"
+snforge_std = "0.51.1"
 
 [dependencies]
 starknet.workspace = true
diff --git a/packages/account/src/tests/test_secp256_point.cairo b/packages/account/src/tests/test_secp256_point.cairo
@@ -72,7 +72,6 @@ fn test_partial_eq() {
 
 #[cfg(feature: 'fuzzing')]
 mod fuzz_tests {
-    use openzeppelin_testing::FuzzableBool;
     use starknet::SyscallResultTrait;
     use starknet::secp256_trait::{Secp256PointTrait, Secp256Trait};
     use starknet::secp256k1::Secp256k1Point;
@@ -90,7 +89,7 @@ mod fuzz_tests {
                 Option::Some(point) => point,
                 Option::None => { return; },
             },
-            Result::Err => { return; },
+            Result::Err(_) => { return; },
         };
 
         let (expected_x, expected_y) = point.get_coordinates().unwrap_syscall();
@@ -111,7 +110,7 @@ mod fuzz_tests {
                 Option::Some(point) => point,
                 Option::None => { return; },
             },
-            Result::Err => { return; },
+            Result::Err(_) => { return; },
         };
 
         let (expected_x, expected_y) = point.get_coordinates().unwrap_syscall();
diff --git a/packages/governance/src/governor/proposal_core.cairo b/packages/governance/src/governor/proposal_core.cairo
@@ -83,8 +83,9 @@ impl ProposalCoreStorePacking of StorePacking<ProposalCore, (felt252, felt252)>
 mod tests {
     use core::num::traits::Bounded;
     use openzeppelin_testing::constants::ALICE;
-    use openzeppelin_testing::{FuzzableBool, FuzzableContractAddress};
-    use super::{ContractAddress, ProposalCore, ProposalCoreStorePacking as StorePacking};
+    #[cfg(feature: 'fuzzing')]
+    use super::ContractAddress;
+    use super::{ProposalCore, ProposalCoreStorePacking as StorePacking};
 
     #[test]
     fn test_pack_and_unpack() {
diff --git a/packages/governance/src/multisig/storage_utils.cairo b/packages/governance/src/multisig/storage_utils.cairo
@@ -85,7 +85,6 @@ pub impl SignersInfoStorePackingV2 of StorePacking<SignersInfo, u128> {
 #[cfg(test)]
 #[cfg(feature: 'fuzzing')]
 mod tests {
-    use openzeppelin_testing::FuzzableBool;
     use starknet::storage_access::StorePacking;
     use super::{SignersInfo, TxInfo};
 
diff --git a/packages/presets/src/tests/test_account.cairo b/packages/presets/src/tests/test_account.cairo
@@ -29,9 +29,6 @@ use snforge_std::{
 use starknet::account::Call;
 use starknet::{ClassHash, ContractAddress};
 use crate::AccountUpgradeable;
-use crate::interfaces::account::{
-    AccountUpgradeableABISafeDispatcher, AccountUpgradeableABISafeDispatcherTrait,
-};
 use crate::interfaces::{AccountUpgradeableABIDispatcher, AccountUpgradeableABIDispatcherTrait};
 
 //
@@ -519,7 +516,7 @@ fn test_upgraded_event() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_v2_missing_camel_selector() {
     let key_pair = KEY_PAIR();
     let (account_address, v1_dispatcher) = setup_dispatcher(key_pair);
@@ -528,10 +525,8 @@ fn test_v2_missing_camel_selector() {
     start_cheat_caller_address(account_address, account_address);
     v1_dispatcher.upgrade(v2_class_hash);
 
-    let safe_dispatcher = AccountUpgradeableABISafeDispatcher { contract_address: account_address };
-    let result = safe_dispatcher.getPublicKey();
-
-    utils::assert_entrypoint_not_found_error(result, selector!("getPublicKey"), account_address)
+    let dispatcher = AccountUpgradeableABIDispatcher { contract_address: account_address };
+    dispatcher.getPublicKey();
 }
 
 #[test]
diff --git a/packages/presets/src/tests/test_erc1155.cairo b/packages/presets/src/tests/test_erc1155.cairo
@@ -1,7 +1,7 @@
 use core::num::traits::Zero;
 use openzeppelin_interfaces::erc1155 as interface;
 use openzeppelin_interfaces::erc1155::{
-    IERC1155CamelSafeDispatcher, IERC1155CamelSafeDispatcherTrait, IERC1155Dispatcher,
+    IERC1155CamelDispatcher, IERC1155CamelDispatcherTrait, IERC1155Dispatcher,
     IERC1155DispatcherTrait,
 };
 use openzeppelin_test_common::erc1155::{
@@ -762,18 +762,16 @@ fn test_upgraded_event() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_v2_missing_camel_selector() {
     let (_, v1, owner) = setup_dispatcher();
     let v2_class_hash = V2_CLASS_HASH();
 
     start_cheat_caller_address(v1.contract_address, owner);
     v1.upgrade(v2_class_hash);
 
-    let safe_dispatcher = IERC1155CamelSafeDispatcher { contract_address: v1.contract_address };
-    let result = safe_dispatcher.balanceOf(owner, TOKEN_ID);
-
-    utils::assert_entrypoint_not_found_error(result, selector!("balanceOf"), v1.contract_address)
+    let dispatcher = IERC1155CamelDispatcher { contract_address: v1.contract_address };
+    dispatcher.balanceOf(owner, TOKEN_ID);
 }
 
 #[test]
diff --git a/packages/presets/src/tests/test_erc20.cairo b/packages/presets/src/tests/test_erc20.cairo
@@ -12,9 +12,6 @@ use openzeppelin_testing::{EventSpyExt, EventSpyQueue as EventSpy, spy_events};
 use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::start_cheat_caller_address;
 use starknet::ClassHash;
-use crate::interfaces::erc20::{
-    ERC20UpgradeableABISafeDispatcher, ERC20UpgradeableABISafeDispatcherTrait,
-};
 use crate::interfaces::{ERC20UpgradeableABIDispatcher, ERC20UpgradeableABIDispatcherTrait};
 
 fn V2_CLASS_HASH() -> ClassHash {
@@ -434,20 +431,16 @@ fn test_upgraded_event() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_v2_missing_camel_selector() {
     let (_, mut v1) = setup_dispatcher();
     let v2_class_hash = V2_CLASS_HASH();
 
     start_cheat_caller_address(v1.contract_address, OWNER);
     v1.upgrade(v2_class_hash);
 
-    let safe_dispatcher = ERC20UpgradeableABISafeDispatcher {
-        contract_address: v1.contract_address,
-    };
-    let result = safe_dispatcher.totalSupply();
-
-    utils::assert_entrypoint_not_found_error(result, selector!("totalSupply"), v1.contract_address)
+    let dispatcher = ERC20UpgradeableABIDispatcher { contract_address: v1.contract_address };
+    dispatcher.totalSupply();
 }
 
 #[test]
diff --git a/packages/presets/src/tests/test_erc721.cairo b/packages/presets/src/tests/test_erc721.cairo
@@ -1,6 +1,6 @@
 use core::num::traits::Zero;
 use openzeppelin_interfaces::erc721::{
-    IERC721CamelOnlySafeDispatcher, IERC721CamelOnlySafeDispatcherTrait, IERC721Dispatcher,
+    IERC721CamelOnlyDispatcher, IERC721CamelOnlyDispatcherTrait, IERC721Dispatcher,
     IERC721DispatcherTrait, IERC721_ID, IERC721_METADATA_ID,
 };
 use openzeppelin_interfaces::introspection::ISRC5_ID;
@@ -862,19 +862,16 @@ fn test_upgraded_event() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_v2_missing_camel_selector() {
     let (_, mut v1) = setup_dispatcher();
     let v2_class_hash = V2_CLASS_HASH();
 
     start_cheat_caller_address(v1.contract_address, OWNER);
     v1.upgrade(v2_class_hash);
 
-    let safe_dispatcher = IERC721CamelOnlySafeDispatcher { contract_address: v1.contract_address };
-    let mut result = safe_dispatcher.ownerOf(TOKEN_1);
-    let selector = selector!("ownerOf");
-
-    utils::assert_entrypoint_not_found_error(result, selector, v1.contract_address);
+    let dispatcher = IERC721CamelOnlyDispatcher { contract_address: v1.contract_address };
+    dispatcher.ownerOf(TOKEN_1);
 }
 
 #[test]
diff --git a/packages/presets/src/tests/test_eth_account.cairo b/packages/presets/src/tests/test_eth_account.cairo
@@ -32,9 +32,6 @@ use starknet::secp256_trait::Secp256Trait;
 use starknet::secp256k1::Secp256k1Point;
 use starknet::{ClassHash, ContractAddress, SyscallResultTrait};
 use crate::EthAccountUpgradeable;
-use crate::interfaces::eth_account::{
-    EthAccountUpgradeableABISafeDispatcher, EthAccountUpgradeableABISafeDispatcherTrait,
-};
 use crate::interfaces::{
     EthAccountUpgradeableABIDispatcher, EthAccountUpgradeableABIDispatcherTrait,
 };
@@ -472,7 +469,7 @@ fn test_upgraded_event() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_v2_missing_camel_selector() {
     let (_, v1) = setup_dispatcher(KEY_PAIR());
     let contract_address = v1.contract_address;
@@ -481,10 +478,8 @@ fn test_v2_missing_camel_selector() {
     start_cheat_caller_address(contract_address, contract_address);
     v1.upgrade(v2_class_hash);
 
-    let safe_dispatcher = EthAccountUpgradeableABISafeDispatcher { contract_address };
-    let result = safe_dispatcher.getPublicKey();
-
-    utils::assert_entrypoint_not_found_error(result, selector!("getPublicKey"), contract_address)
+    let dispatcher = EthAccountUpgradeableABIDispatcher { contract_address };
+    dispatcher.getPublicKey();
 }
 
 #[test]
diff --git a/packages/testing/CHANGELOG.md b/packages/testing/CHANGELOG.md
@@ -9,6 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed (Breaking)
+
+- Bump snforge to v0.51.0 (#1555)
+
+### Removed
+
+- Removed `assert_entrypoint_not_found_error` from snforge updating the panic error message format (#1555)
+- Removed `FuzzableContractAddress` and `FuzzableBool` implementations as they are now provided by snforge (#1555)
+
 ## 5.0.0 (2025-10-01)
 
 ### Changed (Breaking)
diff --git a/packages/testing/src/common.cairo b/packages/testing/src/common.cairo
@@ -1,8 +1,5 @@
 use core::to_byte_array::FormatAsByteArray;
 use openzeppelin_testing::constants::AsAddressImpl;
-use snforge_std::cheatcodes::generate_arg::generate_arg;
-use snforge_std::fuzzable::Fuzzable;
-use starknet::{ContractAddress, SyscallResult};
 
 /// Converts panic data into a string (ByteArray).
 ///
@@ -54,50 +51,3 @@ pub impl IntoBase16String<T, +Into<T, felt252>> of IntoBase16StringTrait<T> {
         to_base_16_string_no_padding(self.into())
     }
 }
-
-/// Asserts that the syscall result of a call failed with an "Entrypoint not found" error,
-/// following the Starknet Foundry emitted error format.
-pub fn assert_entrypoint_not_found_error<T, +Drop<T>>(
-    result: SyscallResult<T>, selector: felt252, contract_address: ContractAddress,
-) {
-    if let Result::Err(panic_data) = result {
-        let expected_panic_message = format!(
-            "Entry point selector {} not found in contract {}",
-            selector.into_base_16_string_no_padding(),
-            contract_address.into_base_16_string_no_padding(),
-        );
-        let actual_panic_message = panic_data_to_byte_array(panic_data);
-        assert!(
-            actual_panic_message == expected_panic_message,
-            "Got unexpected panic message: {actual_panic_message}",
-        );
-    } else {
-        panic!("{selector} call was expected to fail, but succeeded");
-    }
-}
-
-/// An implementation of Fuzzable trait to support boolean parameters in fuzz tests.
-pub impl FuzzableBool of Fuzzable<bool> {
-    fn blank() -> bool {
-        false
-    }
-
-    fn generate() -> bool {
-        generate_arg(0, 1) == 1
-    }
-}
-
-const MAX_CONTRACT_ADDRESS: felt252 =
-    0x800000000000000000000000000000000000000000000000000000000000000
-    - 1;
-
-/// An implementation of Fuzzable trait to support ContractAddress parameters in fuzz tests.
-pub impl FuzzableContractAddress of Fuzzable<ContractAddress> {
-    fn blank() -> ContractAddress {
-        0.as_address()
-    }
-
-    fn generate() -> ContractAddress {
-        generate_arg(0, MAX_CONTRACT_ADDRESS).as_address()
-    }
-}
diff --git a/packages/testing/src/lib.cairo b/packages/testing/src/lib.cairo
@@ -4,10 +4,7 @@ pub mod deployment;
 pub mod events;
 pub mod signing;
 
-pub use common::{
-    FuzzableBool, FuzzableContractAddress, IntoBase16StringTrait, assert_entrypoint_not_found_error,
-    panic_data_to_byte_array, to_base_16_string,
-};
+pub use common::{IntoBase16StringTrait, panic_data_to_byte_array, to_base_16_string};
 pub use constants::AsAddressTrait;
 pub use deployment::{
     declare_and_deploy, declare_and_deploy_at, declare_class, deploy, deploy_another_at, deploy_at,
diff --git a/packages/upgrades/src/tests/test_upgradeable.cairo b/packages/upgrades/src/tests/test_upgradeable.cairo
@@ -1,9 +1,8 @@
 use openzeppelin_test_common::mocks::upgrades::{
-    IUpgradesV1Dispatcher, IUpgradesV1DispatcherTrait, IUpgradesV1SafeDispatcher,
-    IUpgradesV1SafeDispatcherTrait, IUpgradesV2Dispatcher, IUpgradesV2DispatcherTrait,
+    IUpgradesV1Dispatcher, IUpgradesV1DispatcherTrait, IUpgradesV2Dispatcher,
+    IUpgradesV2DispatcherTrait,
 };
 use openzeppelin_test_common::upgrades::UpgradeableSpyHelpers;
-use openzeppelin_testing as utils;
 use openzeppelin_testing::constants::{CLASS_HASH_ZERO, FELT_VALUE as VALUE};
 use openzeppelin_testing::{declare_class, deploy, spy_events};
 use snforge_std::ContractClass;
@@ -72,18 +71,15 @@ fn test_remove_selector_passes_in_v1() {
 }
 
 #[test]
-#[feature("safe_dispatcher")]
+#[should_panic(expected: 'ENTRYPOINT_NOT_FOUND')]
 fn test_remove_selector_fails_in_v2() {
     let (v1, v2_class) = setup_test();
 
     v1.upgrade(v2_class.class_hash);
 
     // We use the v1 dispatcher because `remove_selector` is not in v2 interface
-    let safe_dispatcher = IUpgradesV1SafeDispatcher { contract_address: v1.contract_address };
-    let mut result = safe_dispatcher.remove_selector();
-    utils::assert_entrypoint_not_found_error(
-        result, selector!("remove_selector"), v1.contract_address,
-    );
+    let dispatcher = IUpgradesV1Dispatcher { contract_address: v1.contract_address };
+    dispatcher.remove_selector();
 }
 
 //
