Move base contracts under infrastructure folder as they're only relev…

…ant and used there
argentlabs · May 6, 2020 · 6002414 · 6002414
1 parent 6f04028
commit 6002414
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/contracts/infrastructure/CompoundRegistry.sol b/contracts/infrastructure/CompoundRegistry.sol
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 
 /**
  * @title CompoundRegistry

diff --git a/contracts/infrastructure/MakerRegistry.sol b/contracts/infrastructure/MakerRegistry.sol
@@ -1,5 +1,5 @@
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 import "../../lib/maker/MakerInterfaces.sol";
 
 /**

diff --git a/contracts/infrastructure/ModuleRegistry.sol b/contracts/infrastructure/ModuleRegistry.sol
@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../base/Owned.sol";
+import "./base/Owned.sol";
 import "../../lib/other/ERC20.sol";
 
 /**

diff --git a/contracts/infrastructure/TokenPriceProvider.sol b/contracts/infrastructure/TokenPriceProvider.sol
@@ -16,7 +16,7 @@
 pragma solidity ^0.5.4;
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "../../lib/other/ERC20.sol";
-import "../base/Managed.sol";
+import "./base/Managed.sol";
 
 contract TokenPriceProvider is Managed {
     using SafeMath for uint256;

diff --git a/contracts/infrastructure/WalletFactory.sol b/contracts/infrastructure/WalletFactory.sol
@@ -16,8 +16,8 @@
 pragma solidity ^0.5.4;
 import "../wallet/Proxy.sol";
 import "../wallet/BaseWallet.sol";
-import "../base/Owned.sol";
-import "../base/Managed.sol";
+import "./base/Owned.sol";
+import "./base/Managed.sol";
 import "../infrastructure/ens/IENSManager.sol";
 import "../infrastructure/ModuleRegistry.sol";
 import "../modules/storage/IGuardianStorage.sol";

diff --git a/contracts/base/Managed.sol → contracts/infrastructure/base/Managed.sol b/contracts/base/Managed.sol → contracts/infrastructure/base/Managed.sol
diff --git a/contracts/base/Owned.sol → contracts/infrastructure/base/Owned.sol b/contracts/base/Owned.sol → contracts/infrastructure/base/Owned.sol
diff --git a/contracts/infrastructure/ens/ArgentENSManager.sol b/contracts/infrastructure/ens/ArgentENSManager.sol
@@ -19,7 +19,7 @@ import "../../../lib/utils/strings.sol";
 import "./IENSManager.sol";
 import "./ENSResolver.sol";
 import "./ENSReverseRegistrar.sol";
-import "../../base/Managed.sol";
+import "../base/Managed.sol";
 
 /**
  * @title ArgentENSManager

diff --git a/contracts/infrastructure/ens/ArgentENSResolver.sol b/contracts/infrastructure/ens/ArgentENSResolver.sol
@@ -14,8 +14,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../base/Owned.sol";
-import "../../base/Managed.sol";
+import "../base/Owned.sol";
+import "../base/Managed.sol";
 import "./ENSResolver.sol";
 
 /**