corrected safe fork lib to be internal

TempleDAO · Aug 11, 2023 · 81553f6 · 81553f6
1 parent b006c84
commit 81553f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/protocol/contracts/v2/safeGuards/SafeForked.sol b/protocol/contracts/v2/safeGuards/SafeForked.sol
@@ -63,7 +63,7 @@ library SafeForked {
         bytes memory data,
         bytes memory signatures,
         uint256 requiredSignatures
-    ) public view {
+    ) internal view {
         // Check that the provided signature data is not too short
         // Left as a revert string so it shows in the Safe UI, and made more descriptive.
         require(signatures.length >= requiredSignatures * 65, "!Dynamic Signature Threshold");

diff --git a/protocol/test/forge/v2/safeGuards/ThresholdSafeGuard.t.sol b/protocol/test/forge/v2/safeGuards/ThresholdSafeGuard.t.sol
@@ -794,8 +794,8 @@ contract ThresholdSafeGuardTest is ThresholdSafeGuardTestBase {
                 abi.encodeWithSelector(fnSelector, "abc", 1), 
                 makeSignSpecs(
                     SignSpec(SignType.AS_EXECUTOR, safeOwners[0]),
-                    SignSpec(SignType.AS_CONTRACT, safeOwners[3]), // This is a Safe itself
-                    SignSpec(SignType.AS_EOA_TX, safeOwners[1])
+                    SignSpec(SignType.AS_EOA_TX, safeOwners[1]),
+                    SignSpec(SignType.AS_CONTRACT, safeOwners[3]) // This is a Safe itself
                 ),
                 // Add the signer details Safe owner - only need 2/3 as this safe doesn't use the same guard
                 makeSignSpecs(
@@ -814,8 +814,8 @@ contract ThresholdSafeGuardTest is ThresholdSafeGuardTestBase {
                 abi.encodeWithSelector(fnSelector2), 
                 makeSignSpecs(
                     SignSpec(SignType.AS_EXECUTOR, safeOwners[0]),
-                    SignSpec(SignType.AS_CONTRACT, safeOwners[3]), // This is a Safe itself
-                    SignSpec(SignType.AS_EOA_TX, safeOwners[1])
+                    SignSpec(SignType.AS_EOA_TX, safeOwners[1]),
+                    SignSpec(SignType.AS_CONTRACT, safeOwners[3]) // This is a Safe itself
                 ),
                 // Add the signer details Safe owner - only need 2/3 as this safe doesn't use the same guard
                 makeSignSpecs(
@@ -1004,8 +1004,8 @@ contract ThresholdSafeGuardExecuteTest is ThresholdSafeGuardTestBase {
                     fnCall, 
                     makeSignSpecs(
                         SignSpec(SignType.AS_EXECUTOR, safeOwners[0]),
-                        SignSpec(SignType.AS_CONTRACT, safeOwners[3]), // This is a Safe itself
-                        SignSpec(SignType.AS_EOA_TX, safeOwners[1])
+                        SignSpec(SignType.AS_EOA_TX, safeOwners[1]),
+                        SignSpec(SignType.AS_CONTRACT, safeOwners[3]) // This is a Safe itself
                     ),
                     // Add the signer details Safe owner
                     makeSignSpecs(
@@ -1029,8 +1029,8 @@ contract ThresholdSafeGuardExecuteTest is ThresholdSafeGuardTestBase {
                     fnCall, 
                     makeSignSpecs(
                         SignSpec(SignType.AS_EXECUTOR, safeOwners[0]),
-                        SignSpec(SignType.AS_CONTRACT, safeOwners[3]), // This is a Safe itself
-                        SignSpec(SignType.AS_EOA_TX, safeOwners[1])
+                        SignSpec(SignType.AS_EOA_TX, safeOwners[1]),
+                        SignSpec(SignType.AS_CONTRACT, safeOwners[3]) // This is a Safe itself
                     ),
                     // Add the signer details Safe owner
                     makeSignSpecs(