chore: move test contract to GPv2Signing foldedr

cowprotocol · Aug 14, 2024 · e68b367 · e68b367
1 parent ac6bcae
commit e68b367
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git a/test/GPv2Signing.test.ts b/test/GPv2Signing.test.ts
diff --git a/test/GPv2Signing/CalldataManipulation.t.sol b/test/GPv2Signing/CalldataManipulation.t.sol
@@ -5,7 +5,7 @@ import {Vm} from "forge-std/Test.sol";
 
 import {GPv2Order, GPv2Signing, IERC20} from "src/contracts/mixins/GPv2Signing.sol";
 
-import {GPv2SigningTestInterface, Helper} from "./Helper.sol";
+import {Harness, Helper} from "./Helper.sol";
 
 import {Bytes} from "test/libraries/Bytes.sol";
 import {OrderFuzz} from "test/libraries/OrderFuzz.sol";
@@ -47,7 +47,7 @@ contract CalldataManipulation is Helper {
 
         IERC20[] memory tokens = encoder.tokens();
         bytes memory encodedTransactionData =
-            abi.encodeCall(GPv2SigningTestInterface.recoverOrderFromTradeTest, (tokens, encoder.trades[0]));
+            abi.encodeCall(Harness.recoverOrderFromTradeTest, (tokens, encoder.trades[0]));
 
         // calldata encoding:
         //  -  4 bytes: signature

diff --git a/test/GPv2Signing/Helper.sol b/test/GPv2Signing/Helper.sol
@@ -3,15 +3,20 @@ pragma solidity ^0.8;
 
 import {Test} from "forge-std/Test.sol";
 
-import {GPv2Order} from "src/contracts/mixins/GPv2Signing.sol";
+import {GPv2Order, GPv2Signing, GPv2Trade, IERC20} from "src/contracts/mixins/GPv2Signing.sol";
 
 import {Sign} from "test/libraries/Sign.sol";
-import {GPv2SigningTestInterface} from "test/src/GPv2SigningTestInterface.sol";
 
-// TODO: move the content of `GPv2SigningTestInterface` here once all tests have
-// been removed.
-// solhint-disable-next-line no-empty-blocks
-contract Harness is GPv2SigningTestInterface {
+contract Harness is GPv2Signing {
+    function recoverOrderFromTradeTest(IERC20[] calldata tokens, GPv2Trade.Data calldata trade)
+        external
+        view
+        returns (GPv2Signing.RecoveredOrder memory recoveredOrder)
+    {
+        recoveredOrder = allocateRecoveredOrder();
+        recoverOrderFromTrade(recoveredOrder, tokens, trade);
+    }
+
     function recoverOrderSignerTest(GPv2Order.Data memory order, Sign.Signature calldata signature)
         public
         view

diff --git a/test/src/GPv2SigningTestInterface.sol b/test/src/GPv2SigningTestInterface.sol