Switch contracts that are compiled alone back to the main contracts/m…

…odules folder
argentlabs · Nov 9, 2020 · 9f7f4f4 · 9f7f4f4
1 parent f961477
commit 9f7f4f4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/...les/ApprovedTransfer/ApprovedTransfer.sol → contracts/modules/ApprovedTransfer.sol b/...les/ApprovedTransfer/ApprovedTransfer.sol → contracts/modules/ApprovedTransfer.sol
@@ -17,11 +17,11 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/LimitUtils.sol";
-import "../common/BaseTransfer.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/storage/IGuardianStorage.sol";
+import "./common/Utils.sol";
+import "./common/LimitUtils.sol";
+import "./common/BaseTransfer.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/storage/IGuardianStorage.sol";
 
 /**
  * @title ApprovedTransfer

diff --git a/...modules/RelayerManager/RelayerManager.sol → contracts/modules/RelayerManager.sol b/...modules/RelayerManager/RelayerManager.sol → contracts/modules/RelayerManager.sol
@@ -17,13 +17,13 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/BaseFeature.sol";
-import "../common/GuardianUtils.sol";
-import "../common/LimitUtils.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../infrastructure/storage/IGuardianStorage.sol";
+import "./common/Utils.sol";
+import "./common/BaseFeature.sol";
+import "./common/GuardianUtils.sol";
+import "./common/LimitUtils.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../infrastructure/storage/IGuardianStorage.sol";
 
 /**
  * @title RelayerManager

diff --git a/...modules/TokenExchanger/TokenExchanger.sol → contracts/modules/TokenExchanger.sol b/...modules/TokenExchanger/TokenExchanger.sol → contracts/modules/TokenExchanger.sol
@@ -17,11 +17,11 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/BaseFeature.sol";
-import "../../../lib/other/ERC20.sol";
-import "../../../lib/paraswap/IAugustusSwapper.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../infrastructure/IDexRegistry.sol";
+import "./common/BaseFeature.sol";
+import "../../lib/other/ERC20.sol";
+import "../../lib/paraswap/IAugustusSwapper.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../infrastructure/IDexRegistry.sol";
 
 /**
  * @title TokenExchanger

diff --git a/...dules/TransferManager/TransferManager.sol → contracts/modules/TransferManager.sol b/...dules/TransferManager/TransferManager.sol → contracts/modules/TransferManager.sol
@@ -17,13 +17,13 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../common/Utils.sol";
-import "../common/BaseTransfer.sol";
-import "../common/LimitUtils.sol";
-import "../../infrastructure/storage/ILimitStorage.sol";
-import "../../infrastructure/storage/ITransferStorage.sol";
-import "../../infrastructure/ITokenPriceRegistry.sol";
-import "../../../lib/other/ERC20.sol";
+import "./common/Utils.sol";
+import "./common/BaseTransfer.sol";
+import "./common/LimitUtils.sol";
+import "../infrastructure/storage/ILimitStorage.sol";
+import "../infrastructure/storage/ITransferStorage.sol";
+import "../infrastructure/ITokenPriceRegistry.sol";
+import "../../lib/other/ERC20.sol";
 
 /**
  * @title TransferManager

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "compile:infrastructure_0.5": "npx truffle compile --config truffle-config-infrastructure-0.5.js",
     "compile:infrastructure_0.6": "npx truffle compile --config truffle-config-infrastructure.js",
     "compile:infrastructure": "npm run compile:infrastructure_0.5 && npm run compile:infrastructure_0.6",
-    "compile:modules": "npx truffle compile --config truffle-config-modules.js && rm build/ApprovedTransfer.json && npx truffle compile --workingDirectory contracts/modules/ApprovedTransfer --runs=999 && rm build/RelayerManager.json && npx truffle compile --workingDirectory contracts/modules/RelayerManager --runs=999 && rm build/TransferManager.json && npx truffle compile --workingDirectory contracts/modules/TransferManager --runs=999 && rm build/TokenExchanger.json && npx truffle compile --workingDirectory contracts/modules/TokenExchanger --runs=999",
+    "compile:modules": "npx truffle compile --config truffle-config-modules.js && rm build/contracts/ApprovedTransfer.json && npx truffle compile --contracts_directory=./contracts/modules/ApprovedTransfer*.sol && rm build/contracts/RelayerManager.json && npx truffle compile --contracts_directory=./contracts/modules/RelayerManager*.sol && rm build/contracts/TransferManager.json && npx truffle compile --contracts_directory=./contracts/modules/TransferManager*.sol && rm build/contracts/TokenExchanger.json && npx truffle compile --contracts_directory=./contracts/modules/TokenExchanger*.sol",
     "compile:wallet": "npx truffle compile --config truffle-config-wallet.js",
     "compile:test": "npx truffle compile --config truffle-config-contracts-test.js",
     "compile": "npm run compile:infrastructure && npm run compile:modules && npm run compile:wallet",