shared allowance test

Author: snreynolds

test/shared/AllowanceUnitTest_ERC20.t.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+import "forge-std/Test.sol";
+import "../mocks/MockPermit2.sol";
+import {BaseAllowanceUnitTest} from "./BaseAllowanceUnitTest.sol";
+import {TokenProvider} from "../utils/TokenProvider.sol";
+
+contract AllowanceUnitTest_ERC20 is BaseAllowanceUnitTest {
+    function setUp() public override {
+        permit2 = new MockPermit2();
+        initializeERC20Tokens();
+    }
+
+    function allowance(address from, address token, address spender)
+        public
+        view
+        override
+        returns (uint160, uint48, uint48)
+    {
+        return MockPermit2(address(permit2)).allowance(from, token, spender);
+    }
+
+    function token() public view override returns (address) {
+        return address(token1);
+    }
+}

test/shared/AllowanceUnitTest_ERC721.t.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+import "forge-std/Test.sol";
+import "../mocks/MockPermit2_ERC721.sol";
+import {BaseAllowanceUnitTest} from "./BaseAllowanceUnitTest.sol";
+import {TokenProvider} from "../utils/TokenProvider.sol";
+
+contract AllowanceUnitTest_ERC721 is BaseAllowanceUnitTest {
+    function setUp() public override {
+        permit2 = new MockPermit2_ERC721();
+        initializeNFTTokens();
+    }
+
+    function allowance(address from, address token, address spender)
+        public
+        view
+        override
+        returns (uint160, uint48, uint48)
+    {
+        return MockPermit2_ERC721(address(permit2)).allowance(from, token, spender);
+    }
+
+    function token() public view override returns (address) {
+        return address(nft1);
+    }
+}

test/AllowanceUnitTest.sol test/shared/BaseAllowanceUnitTest.soltest/AllowanceUnitTest.sol renamed to test/shared/BaseAllowanceUnitTest.sol

@@ -2,30 +2,31 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import "./mocks/MockPermit2.sol";
-import {TokenProvider} from "./utils/TokenProvider.sol";
+import "../mocks/IMockPermit2.sol";
+import {TokenProvider} from "../utils/TokenProvider.sol";
 
-contract AllowanceUnitTest is Test, TokenProvider {
-    MockPermit2 permit2;
+abstract contract BaseAllowanceUnitTest is Test, TokenProvider {
+    IMockPermit2 permit2;
 
     address from = address(0xBEEE);
     address spender = address(0xBBBB);
 
-    function setUp() public {
-        permit2 = new MockPermit2();
-        initializeERC20Tokens();
-    }
+    function setUp() public virtual {}
+
+    function allowance(address from, address token, address spender) public virtual returns (uint160, uint48, uint48);
+
+    function token() public virtual returns (address);
 
     function testUpdateAmountExpirationRandomly(uint160 amount, uint48 expiration) public {
-        address token = address(token1);
+        address token = token();
 
-        (,, uint48 nonce) = permit2.allowance(from, token, spender);
+        (,, uint48 nonce) = allowance(from, token, spender);
 
         permit2.mockUpdateSome(from, token, spender, amount, expiration);
 
         uint48 timestampAfterUpdate = expiration == 0 ? uint48(block.timestamp) : expiration;
 
-        (uint160 amount1, uint48 expiration1, uint48 nonce1) = permit2.allowance(from, token, spender);
+        (uint160 amount1, uint48 expiration1, uint48 nonce1) = allowance(from, token, spender);
         assertEq(amount, amount1);
         assertEq(timestampAfterUpdate, expiration1);
         /// nonce shouldnt change
@@ -37,14 +38,14 @@ contract AllowanceUnitTest is Test, TokenProvider {
         // we assume we will never be able to reach 2**48
         vm.assume(nonce < type(uint48).max);
 
-        address token = address(token1);
+        address token = token();
 
         permit2.mockUpdateAll(from, token, spender, amount, expiration, nonce);
 
         uint48 nonceAfterUpdate = nonce + 1;
         uint48 timestampAfterUpdate = expiration == 0 ? uint48(block.timestamp) : expiration;
 
-        (uint160 amount1, uint48 expiration1, uint48 nonce1) = permit2.allowance(from, token, spender);
+        (uint160 amount1, uint48 expiration1, uint48 nonce1) = allowance(from, token, spender);
 
         assertEq(amount, amount1);
         assertEq(timestampAfterUpdate, expiration1);
@@ -54,18 +55,18 @@ contract AllowanceUnitTest is Test, TokenProvider {
     function testPackAndUnpack(uint160 amount, uint48 expiration, uint48 nonce) public {
         // pack some numbers
         uint256 word = Allowance.pack(amount, expiration, nonce);
-
+        address token = token();
         // store the raw word
-        permit2.doStore(from, address(token1), spender, word);
+        permit2.doStore(from, token, spender, word);
 
         // load it as a packed allowance
-        (uint160 amount1, uint48 expiration1, uint48 nonce1) = permit2.allowance(from, address(token1), spender);
+        (uint160 amount1, uint48 expiration1, uint48 nonce1) = allowance(from, token, spender);
         assertEq(amount, amount1);
         assertEq(expiration, expiration1);
         assertEq(nonce, nonce1);
 
         // get the stored word
-        uint256 word1 = permit2.getStore(from, address(token1), spender);
+        uint256 word1 = permit2.getStore(from, token, spender);
         assertEq(word, word1);
     }
 }