import matching

Uniswap · Jan 13, 2023 · 5cd3a7c · 5cd3a7c
1 parent f6b73f7
commit 5cd3a7c
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 17 deletions.
diff --git a/src/ERC20/AllowanceTransfer.sol b/src/ERC20/AllowanceTransfer.sol
@@ -4,10 +4,10 @@ pragma solidity 0.8.17;
 import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
 import {PermitHash} from "./libraries/PermitHash.sol";
-import {SignatureVerification} from "./libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../shared/SignatureVerification.sol";
 import {EIP712} from "./EIP712.sol";
 import {IAllowanceTransfer} from "./interfaces/IAllowanceTransfer.sol";
-import {SignatureExpired, InvalidNonce} from "./PermitErrors.sol";
+import {SignatureExpired, InvalidNonce} from "../shared/PermitErrors.sol";
 import {Allowance} from "./libraries/Allowance.sol";
 
 contract AllowanceTransfer is IAllowanceTransfer, EIP712 {

diff --git a/src/ERC20/SignatureTransfer.sol b/src/ERC20/SignatureTransfer.sol
@@ -2,10 +2,10 @@
 pragma solidity 0.8.17;
 
 import {ISignatureTransfer} from "./interfaces/ISignatureTransfer.sol";
-import {SignatureExpired, InvalidNonce} from "./PermitErrors.sol";
+import {SignatureExpired, InvalidNonce} from "../shared/PermitErrors.sol";
 import {ERC20} from "solmate/src/tokens/ERC20.sol";
 import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
-import {SignatureVerification} from "./libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../shared/SignatureVerification.sol";
 import {PermitHash} from "./libraries/PermitHash.sol";
 import {EIP712} from "./EIP712.sol";
 

diff --git a/src/ERC20/interfaces/IERC1271.sol → src/shared/IERC1271.sol b/src/ERC20/interfaces/IERC1271.sol → src/shared/IERC1271.sol
diff --git a/src/ERC20/PermitErrors.sol → src/shared/PermitErrors.sol b/src/ERC20/PermitErrors.sol → src/shared/PermitErrors.sol
diff --git a/...ERC20/libraries/SignatureVerification.sol → src/shared/SignatureVerification.sol b/...ERC20/libraries/SignatureVerification.sol → src/shared/SignatureVerification.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {IERC1271} from "../interfaces/IERC1271.sol";
+import {IERC1271} from "./IERC1271.sol";
 
 library SignatureVerification {
     /// @notice Thrown when the passed in signature is not a valid length

diff --git a/test/AllowanceTransferInvariants.t.sol b/test/AllowanceTransferInvariants.t.sol
@@ -4,7 +4,7 @@ import "forge-std/Test.sol";
 import {TokenProvider} from "./utils/TokenProvider.sol";
 import {Permit2} from "../src/ERC20/Permit2.sol";
 import {IAllowanceTransfer} from "../src/ERC20/interfaces/IAllowanceTransfer.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 import {PermitSignature} from "./utils/PermitSignature.sol";
 import {InvariantTest} from "./utils/InvariantTest.sol";
 import {MockERC20} from "./mocks/MockERC20.sol";

diff --git a/test/AllowanceTransferTest.t.sol b/test/AllowanceTransferTest.t.sol
@@ -5,12 +5,12 @@ import "forge-std/Test.sol";
 import {TokenProvider} from "./utils/TokenProvider.sol";
 import {Permit2} from "../src/ERC20/Permit2.sol";
 import {PermitSignature} from "./utils/PermitSignature.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 import {AddressBuilder} from "./utils/AddressBuilder.sol";
 import {StructBuilder} from "./utils/StructBuilder.sol";
 import {AmountBuilder} from "./utils/AmountBuilder.sol";
 import {AllowanceTransfer} from "../src/ERC20/AllowanceTransfer.sol";
-import {SignatureExpired, InvalidNonce} from "../src/ERC20/PermitErrors.sol";
+import {SignatureExpired, InvalidNonce} from "../src/shared/PermitErrors.sol";
 import {IAllowanceTransfer} from "../src/ERC20/interfaces/IAllowanceTransfer.sol";
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 

diff --git a/test/NonceBitmap.t.sol b/test/NonceBitmap.t.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.17;
 import "forge-std/Test.sol";
 import {SafeERC20, IERC20, IERC20Permit} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 import {MockPermit2} from "./mocks/MockPermit2.sol";
-import {InvalidNonce} from "../src/ERC20/PermitErrors.sol";
+import {InvalidNonce} from "../src/shared/PermitErrors.sol";
 
 contract NonceBitmapTest is Test {
     MockPermit2 permit2;

diff --git a/test/Permit2Lib.t.sol b/test/Permit2Lib.t.sol
@@ -16,7 +16,7 @@ import {MockPermit2Lib} from "./mocks/MockPermit2Lib.sol";
 import {SafeCast160} from "../src/ERC20/libraries/SafeCast160.sol";
 import {MockPermitWithSmallDS, MockPermitWithLargerDS} from "./mocks/MockPermitWithDS.sol";
 import {MockNonPermitNonERC20WithDS} from "./mocks/MockNonPermitNonERC20WithDS.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 import {MockFallbackERC20} from "./mocks/MockFallbackERC20.sol";
 
 contract Permit2LibTest is Test, PermitSignature, GasSnapshot {

diff --git a/test/SignatureTransfer.t.sol b/test/SignatureTransfer.t.sol
@@ -3,9 +3,9 @@ pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
 import {SafeERC20, IERC20, IERC20Permit} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 import {TokenProvider} from "./utils/TokenProvider.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 import {PermitSignature} from "./utils/PermitSignature.sol";
 import {AddressBuilder} from "./utils/AddressBuilder.sol";
 import {AmountBuilder} from "./utils/AmountBuilder.sol";
@@ -14,7 +14,7 @@ import {Permit2} from "../src/ERC20/Permit2.sol";
 import {SignatureTransfer} from "../src/ERC20/SignatureTransfer.sol";
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
 import {ISignatureTransfer} from "../src/ERC20/interfaces/ISignatureTransfer.sol";
-import {InvalidNonce, SignatureExpired} from "../src/ERC20/PermitErrors.sol";
+import {InvalidNonce, SignatureExpired} from "../src/shared/PermitErrors.sol";
 
 contract SignatureTransferTest is Test, PermitSignature, TokenProvider, GasSnapshot {
     using AddressBuilder for address[];

diff --git a/test/TypehashGeneration.t.sol b/test/TypehashGeneration.t.sol
@@ -9,7 +9,7 @@ import {ISignatureTransfer} from "../src/ERC20/interfaces/ISignatureTransfer.sol
 import {MockSignatureVerification} from "./mocks/MockSignatureVerification.sol";
 import {MockHash} from "./mocks/MockHash.sol";
 import {AddressBuilder} from "./utils/AddressBuilder.sol";
-import {SignatureVerification} from "../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../src/shared/SignatureVerification.sol";
 
 contract TypehashGeneration is Test, PermitSignature {
     using PermitHash for *;

diff --git a/test/integration/Argent.t.sol b/test/integration/Argent.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import {IERC1271} from "../../src/ERC20/interfaces/IERC1271.sol";
+import {IERC1271} from "../../src/shared/IERC1271.sol";
 
 interface WalletFactory {
     function owner() external returns (address);

diff --git a/test/integration/GnosisSafe.t.sol b/test/integration/GnosisSafe.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.17;
 
 import "forge-std/Test.sol";
-import {IERC1271} from "../../src/ERC20/interfaces/IERC1271.sol";
+import {IERC1271} from "../../src/shared/IERC1271.sol";
 
 interface GnosisSafeProxy is IERC1271 {
     function setup(

diff --git a/test/mocks/MockSignatureVerification.sol b/test/mocks/MockSignatureVerification.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {SignatureVerification} from "../../src/ERC20/libraries/SignatureVerification.sol";
+import {SignatureVerification} from "../../src/shared/SignatureVerification.sol";
 
 contract MockSignatureVerification {
     function verify(bytes calldata sig, bytes32 hashed, address signer) public view {