fix: update for ExecuteOrder event

Gearbox-protocol · Feb 27, 2023 · 8fd854e · 8fd854e
1 parent c240b29
commit 8fd854e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/contracts/credit/CreditManager.sol b/contracts/credit/CreditManager.sol
@@ -802,9 +802,7 @@ contract CreditManager is ICreditManagerV2, ACLNonReentrantTrait {
         address creditAccount = getCreditAccountOrRevert(creditFacade); // F:[CM-6]
 
         // Emits an event
-        // emit ExecuteOrder(targetContract, data);
-        // emit ExecuteOrder(targetContract);
-        emit ExecuteOrder(creditAccount, targetContract); // F:[CM-29]
+        emit ExecuteOrder(targetContract); // F:[CM-29]
 
         // Returned data is provided as-is to the caller;
         // It is expected that is is parsed and returned as a correct type

diff --git a/contracts/interfaces/ICreditManagerV2.sol b/contracts/interfaces/ICreditManagerV2.sol
@@ -24,7 +24,7 @@ struct CollateralTokenData {
 
 interface ICreditManagerV2Events {
     /// @dev Emits when a call to an external contract is made through the Credit Manager
-    event ExecuteOrder(address indexed borrower, address indexed target);
+    event ExecuteOrder(address indexed target);
 
     /// @dev Emits when a configurator is upgraded
     event NewConfigurator(address indexed newConfigurator);

diff --git a/contracts/test/credit/CreditFacade.t.sol b/contracts/test/credit/CreditFacade.t.sol
@@ -907,8 +907,8 @@ contract CreditFacadeTest is
             )
         );
 
-        evm.expectEmit(true, true, false, true);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, true);
+        emit ExecuteOrder(address(targetMock));
 
         evm.expectCall(
             creditAccount,
@@ -1045,8 +1045,8 @@ contract CreditFacadeTest is
             )
         );
 
-        evm.expectEmit(true, true, false, false);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, false);
+        emit ExecuteOrder(address(targetMock));
 
         evm.expectCall(
             creditAccount,
@@ -1812,8 +1812,8 @@ contract CreditFacadeTest is
             )
         );
 
-        evm.expectEmit(true, true, false, true);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, true);
+        emit ExecuteOrder(address(targetMock));
 
         evm.expectCall(
             creditAccount,
@@ -2526,8 +2526,8 @@ contract CreditFacadeTest is
             )
         );
 
-        evm.expectEmit(true, true, false, false);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, false);
+        emit ExecuteOrder(address(targetMock));
 
         evm.expectCall(
             creditAccount,
@@ -2833,8 +2833,8 @@ contract CreditFacadeTest is
             )
         );
 
-        evm.expectEmit(true, true, false, true);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, true);
+        emit ExecuteOrder(address(targetMock));
 
         evm.expectCall(
             creditAccount,

diff --git a/contracts/test/credit/CreditManager.t.sol b/contracts/test/credit/CreditManager.t.sol
@@ -1912,8 +1912,8 @@ contract CreditManagerTest is
         bytes memory callData = bytes("Hello, world!");
 
         // we emit the event we expect to see.
-        evm.expectEmit(true, true, false, false);
-        emit ExecuteOrder(creditAccount, address(targetMock));
+        evm.expectEmit(true, false, false, false);
+        emit ExecuteOrder(address(targetMock));
 
         // stack trace check
         evm.expectCall(