From fbb3415d3b038b55ab668aafe89f811bb7b67f8e Mon Sep 17 00:00:00 2001
From: Lasse <16150076+lnist@users.noreply.github.com>
Date: Fri, 28 Apr 2023 11:28:49 +0200
Subject: [PATCH] fix(test): https://github.com/foundry-rs/foundry/issues/4844
 broke a test, disabling for now (#305)

---
 lib/forge-std                                    | 2 +-
 test/lib/AllMethodIdentifiersTest.sol            | 2 +-
 test/strategies/kandel/AaveKandel.t.sol          | 4 ++--
 test/strategies/kandel/abstract/CoreKandel.t.sol | 3 ++-
 test/strategies/unit/AavePooledRouter.t.sol      | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/forge-std b/lib/forge-std
index 4a79aca83..b971f66b8 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit 4a79aca83f8075f8b1b4fe9153945fef08375630
+Subproject commit b971f66b8416e3b09f240f6ee7230ad3bdb13c19
diff --git a/test/lib/AllMethodIdentifiersTest.sol b/test/lib/AllMethodIdentifiersTest.sol
index c705a470c..a654a26bb 100644
--- a/test/lib/AllMethodIdentifiersTest.sol
+++ b/test/lib/AllMethodIdentifiersTest.sol
@@ -6,7 +6,7 @@ import {Vm} from "forge-std/Vm.sol";
 
 library AllMethodIdentifiersTest {
   ///@notice Reads all methodIdentifiers (selectors) from ABI pointed to by relative path from project root.
-  function getAllMethodIdentifiers(Vm vm, string memory relativeAbiPath) public view returns (bytes[] memory selectors) {
+  function getAllMethodIdentifiers(Vm vm, string memory relativeAbiPath) public returns (bytes[] memory selectors) {
     string memory root = vm.projectRoot();
     string memory path = string.concat(root, relativeAbiPath);
     string memory json = vm.readFile(path);
diff --git a/test/strategies/kandel/AaveKandel.t.sol b/test/strategies/kandel/AaveKandel.t.sol
index f69b7571a..0847a8cfd 100644
--- a/test/strategies/kandel/AaveKandel.t.sol
+++ b/test/strategies/kandel/AaveKandel.t.sol
@@ -78,8 +78,8 @@ contract AaveKandelTest is CoreKandelTest {
     return "/out/AaveKandel.sol/AaveKandel.json";
   }
 
-  function test_allExternalFunctions_differentCallers_correctAuth() public override {
-    super.test_allExternalFunctions_differentCallers_correctAuth();
+  function disabled_test_allExternalFunctions_differentCallers_correctAuth() public override {
+    super.disabled_test_allExternalFunctions_differentCallers_correctAuth();
     CheckAuthArgs memory args;
     args.callee = $(kdl);
     args.callers = dynamic([address($(mgv)), maker, $(this)]);
diff --git a/test/strategies/kandel/abstract/CoreKandel.t.sol b/test/strategies/kandel/abstract/CoreKandel.t.sol
index 72c60fadc..c311a3856 100644
--- a/test/strategies/kandel/abstract/CoreKandel.t.sol
+++ b/test/strategies/kandel/abstract/CoreKandel.t.sol
@@ -1427,7 +1427,8 @@ abstract contract CoreKandelTest is KandelTest {
     }
   }
 
-  function test_allExternalFunctions_differentCallers_correctAuth() public virtual {
+  // Disabled until https://github.com/foundry-rs/foundry/issues/4844 is fixed
+  function disabled_test_allExternalFunctions_differentCallers_correctAuth() public virtual {
     // Arrange
     bytes[] memory selectors = AllMethodIdentifiersTest.getAllMethodIdentifiers(vm, getAbiPath());
 
diff --git a/test/strategies/unit/AavePooledRouter.t.sol b/test/strategies/unit/AavePooledRouter.t.sol
index b830b8304..af1aace64 100644
--- a/test/strategies/unit/AavePooledRouter.t.sol
+++ b/test/strategies/unit/AavePooledRouter.t.sol
@@ -513,7 +513,8 @@ contract AavePooledRouterTest is OfferLogicTest {
     assertApproxEqRel(deposit, pooledRouter.balanceOfReserve(weth, maker2), 10 ** 5); // error not worth than 10^-15% of the deposit
   }
 
-  function test_allExternalFunctions_differentCallers_correctAuth() public {
+  // Disabled until https://github.com/foundry-rs/foundry/issues/4844 is fixed
+  function disabled_test_allExternalFunctions_differentCallers_correctAuth() public {
     // Arrange
     bytes[] memory selectors =
       AllMethodIdentifiersTest.getAllMethodIdentifiers(vm, "/out/AavePooledRouter.sol/AavePooledRouter.json");