From cd5433a9b3b39a1a99fe4d9a0e3adfb781dc223a Mon Sep 17 00:00:00 2001
From: Adam Egyed <5456061+adamegyed@users.noreply.github.com>
Date: Wed, 6 Nov 2024 10:17:51 -0800
Subject: [PATCH] chore: cleanup test fixture and foundry.toml (#276)

---
 foundry.toml                        |  1 -
 test/utils/ModuleSignatureUtils.sol | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/foundry.toml b/foundry.toml
index d88c199f..f2e60ca4 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -13,7 +13,6 @@ bytecode_hash = "none"
 auto_detect_remappings = false
 fs_permissions = [
   { access = "read", path = "./out-optimized" },
-  { access = "read-write", path = "./.forge-snapshots" },
   { access = "read", path = "./test/bin" },
 ]
 
diff --git a/test/utils/ModuleSignatureUtils.sol b/test/utils/ModuleSignatureUtils.sol
index a8e65486..4cebaf50 100644
--- a/test/utils/ModuleSignatureUtils.sol
+++ b/test/utils/ModuleSignatureUtils.sol
@@ -45,8 +45,8 @@ contract ModuleSignatureUtils {
         "DeferredAction(uint256 nonce,uint48 deadline,bytes25 validationFunction,bytes call)";
     bytes32 private constant _DEFERRED_ACTION_TYPEHASH =
         keccak256(abi.encodePacked(_DEFERRED_ACTION_CONTENTS_TYPE));
-    bytes32 internal constant _REPLAY_SAFE_HASH_TYPEHASH =
-        0x294a8735843d4afb4f017c76faf3b7731def145ed0025fc9b1d5ce30adf113ff;
+
+    bytes32 internal constant _REPLAY_SAFE_HASH_TYPEHASH = keccak256("ReplaySafeHash(bytes32 hash)");
 
     bytes32 internal constant _ACCOUNT_DOMAIN_SEPARATOR =
         keccak256("EIP712Domain(uint256 chainId,address verifyingContract)");
@@ -245,12 +245,6 @@ contract ModuleSignatureUtils {
 
     // EIP-712 helpers for acount
     function _hashStruct(bytes32 hash) internal pure virtual returns (bytes32) {
-        bytes32 res;
-        assembly ("memory-safe") {
-            mstore(0x00, _REPLAY_SAFE_HASH_TYPEHASH)
-            mstore(0x20, hash)
-            res := keccak256(0x00, 0x40)
-        }
-        return res;
+        return keccak256(abi.encode(_REPLAY_SAFE_HASH_TYPEHASH, hash));
     }
 }