rebase onto master

OpenZeppelin · Feb 23, 2021 · a8011dc · a8011dc
1 parent d355a50
commit a8011dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/contracts/mocks/ERC1271WalletMock.sol b/contracts/mocks/ERC1271WalletMock.sol
@@ -3,8 +3,8 @@
 pragma solidity ^0.8.0;
 
 import "../access/Ownable.sol";
-import "../cryptography/ECDSA.sol";
 import "../interfaces/IERC1271.sol";
+import "../utils/cryptography/ECDSA.sol";
 
 contract ERC1271WalletMock is Ownable, IERC1271 {
     constructor(address originalOwner) {

diff --git a/contracts/mocks/SignatureCheckerMock.sol b/contracts/mocks/SignatureCheckerMock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.0;
 
-import "../cryptography/SignatureChecker.sol";
+import "../utils/cryptography/SignatureChecker.sol";
 
 contract SignatureCheckerMock {
     using SignatureChecker for address;

diff --git a/contracts/cryptography/SignatureChecker.sol → ...s/utils/cryptography/SignatureChecker.sol b/contracts/cryptography/SignatureChecker.sol → ...s/utils/cryptography/SignatureChecker.sol
@@ -3,8 +3,8 @@
 pragma solidity >=0.6.0 <0.9.0;
 
 import "./ECDSA.sol";
-import "../interfaces/IERC1271.sol";
-import "../utils/Address.sol";
+import "../Address.sol";
+import "../../interfaces/IERC1271.sol";
 
 library SignatureChecker {
     function isValidSignature(address signer, bytes32 hash, bytes memory signature) internal view returns (bool) {

diff --git a/test/cryptography/SignatureChecker.test.js → ...ils/cryptography/SignatureChecker.test.js b/test/cryptography/SignatureChecker.test.js → ...ils/cryptography/SignatureChecker.test.js
@@ -1,4 +1,4 @@
-const { toEthSignedMessageHash, fixSignature } = require('../helpers/sign');
+const { toEthSignedMessageHash, fixSignature } = require('../../helpers/sign');
 
 const { expect } = require('chai');