From e25caf2e896be768732e6204243c2b036efa9a4a Mon Sep 17 00:00:00 2001 From: Kieran Prasch Date: Thu, 19 Apr 2018 12:34:20 -0700 Subject: [PATCH] Use import rebindings to extract the dispacter proxy and zeppelin sub-repos. --- nkms/blockchain/eth/sol/compile.py | 18 +++++++++++++++--- nkms/blockchain/eth/sol/compiler.json | 6 ------ .../eth/sol/source/contracts/Issuer.sol | 6 +++--- .../eth/sol/source/contracts/MinersEscrow.sol | 9 ++++----- .../sol/source/contracts/NuCypherKMSToken.sol | 6 +++--- .../sol/source/contracts/PolicyManager.sol | 12 ++++++------ .../eth/sol/source/contracts/UserEscrow.sol | 12 ++++++------ .../source/contracts/lib/AdditionalMath.sol | 2 +- .../{contracts => }/proxy/Dispatcher.sol | 0 .../{contracts => }/proxy/Government.sol | 2 +- .../source/{contracts => }/proxy/README.MD | 0 .../source/{contracts => }/proxy/UPDATE.MD | 0 .../{contracts => }/proxy/Upgradeable.sol | 2 +- .../{contracts => }/proxy/pics/Dispatcher.png | Bin .../proxy/pics/Dispatcher2.png | Bin .../proxy/pics/Dispatcher3.png | Bin .../{contracts => }/proxy/pics/Hard-fork.png | Bin .../{contracts => }/proxy/pics/Hard-fork2.png | Bin .../{contracts => }/proxy/pics/Hard-fork3.png | Bin .../{contracts => }/zeppelin/math/Math.sol | 0 .../zeppelin/math/SafeMath.sol | 0 .../zeppelin/ownership/Ownable.sol | 0 .../zeppelin/token/ERC20/BasicToken.sol | 0 .../zeppelin/token/ERC20/BurnableToken.sol | 0 .../zeppelin/token/ERC20/DetailedERC20.sol | 0 .../zeppelin/token/ERC20/ERC20.sol | 0 .../zeppelin/token/ERC20/ERC20Basic.sol | 0 .../zeppelin/token/ERC20/SafeERC20.sol | 0 .../zeppelin/token/ERC20/StandardToken.sol | 0 .../eth/contracts/contracts/IssuerBad.sol | 2 +- .../contracts/proxy/ContracV2Bad.sol | 2 +- .../contracts/contracts/proxy/ContractV1.sol | 2 +- .../contracts/contracts/proxy/ContractV2.sol | 2 +- .../contracts/proxy/GovernmentBad.sol | 2 +- .../contracts/proxy/GovernmentV2Mock.sol | 2 +- .../contracts/proxy/MinersEscrowV1Mock.sol | 2 +- .../contracts/proxy/PolicyManagerV1Mock.sol | 2 +- 37 files changed, 48 insertions(+), 43 deletions(-) delete mode 100644 nkms/blockchain/eth/sol/compiler.json rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/Dispatcher.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/Government.sol (99%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/README.MD (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/UPDATE.MD (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/Upgradeable.sol (98%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Dispatcher.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Dispatcher2.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Dispatcher3.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Hard-fork.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Hard-fork2.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/proxy/pics/Hard-fork3.png (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/math/Math.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/math/SafeMath.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/ownership/Ownable.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/BasicToken.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/BurnableToken.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/DetailedERC20.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/ERC20.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/ERC20Basic.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/SafeERC20.sol (100%) rename nkms/blockchain/eth/sol/source/{contracts => }/zeppelin/token/ERC20/StandardToken.sol (100%) diff --git a/nkms/blockchain/eth/sol/compile.py b/nkms/blockchain/eth/sol/compile.py index bf25ac39d..4665a54cb 100644 --- a/nkms/blockchain/eth/sol/compile.py +++ b/nkms/blockchain/eth/sol/compile.py @@ -1,3 +1,4 @@ +import distutils import itertools import os @@ -6,10 +7,12 @@ from solc import install_solc, compile_files class SolidityCompiler: - __default_version = 'v0.4.21' # TODO: Update to 4.22 + __default_version = 'v0.4.22' __default_configuration_path = os.path.join(dirname(abspath(__file__)), './compiler.json') - __default_sol_binary_path = os.path.join(os.environ['VIRTUAL_ENV'], 'bin', 'solc') # TODO: Does not work with pytest w/o intervention + __bin_path = os.path.dirname(distutils.spawn.find_executable('python')) + __default_sol_binary_path = os.path.join(__bin_path, 'solc') + __default_contract_dir = os.path.join(dirname(abspath(__file__)), 'source', 'contracts') __default_chain_name = 'tester' @@ -52,10 +55,19 @@ class SolidityCompiler: # Compile with remappings # https://github.com/ethereum/py-solc - remappings = ["contracts={}".format(self._solidity_source_dir)] + project_root = dirname(self._solidity_source_dir) + + remappings = ["contracts={}".format(self._solidity_source_dir), + "zeppelin={}".format(os.path.join(project_root, 'zeppelin')), + "proxy={}".format(os.path.join(project_root, 'proxy')) + ] + compiled_sol = compile_files(source_files=source_paths, import_remappings=remappings, + allow_paths=project_root, optimize=True) + # libraries="AdditionalMath:0x00000000000000000000 Heap:0xABCDEF0123456" + # "LinkedList::0x00000000000000000000 Heap:0xABCDEF0123456") # Cleanup the compiled data keys interfaces = {name.split(':')[-1]: compiled_sol[name] for name in compiled_sol} diff --git a/nkms/blockchain/eth/sol/compiler.json b/nkms/blockchain/eth/sol/compiler.json deleted file mode 100644 index b3bbe10dc..000000000 --- a/nkms/blockchain/eth/sol/compiler.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "language": "Solidity", - "sources": { - "Issuer.sol": {"urls": ["Issuer.sol"]} - } -} diff --git a/nkms/blockchain/eth/sol/source/contracts/Issuer.sol b/nkms/blockchain/eth/sol/source/contracts/Issuer.sol index 32b6a8c15..fd4e64457 100644 --- a/nkms/blockchain/eth/sol/source/contracts/Issuer.sol +++ b/nkms/blockchain/eth/sol/source/contracts/Issuer.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.18; -import "./NuCypherKMSToken.sol"; -import "./zeppelin/math/SafeMath.sol"; -import "./proxy/Upgradeable.sol"; +import "contracts/NuCypherKMSToken.sol"; +import "zeppelin/math/SafeMath.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/MinersEscrow.sol b/nkms/blockchain/eth/sol/source/contracts/MinersEscrow.sol index b1f7c9443..14fc2b36b 100644 --- a/nkms/blockchain/eth/sol/source/contracts/MinersEscrow.sol +++ b/nkms/blockchain/eth/sol/source/contracts/MinersEscrow.sol @@ -1,10 +1,10 @@ pragma solidity ^0.4.18; -import "./zeppelin/token/ERC20/SafeERC20.sol"; -import "./zeppelin/math/Math.sol"; +import "zeppelin/token/ERC20/SafeERC20.sol"; +import "zeppelin/math/Math.sol"; import "./lib/AdditionalMath.sol"; -import "./Issuer.sol"; +import "contracts/Issuer.sol"; /** * @notice PolicyManager interface @@ -14,9 +14,8 @@ contract PolicyManagerInterface { function escrow() public view returns (address); } - /** -* @notice Contract holds and locks nodes tokens. +* @notice Contract holds and locks nodes tokens.self._solidity_source_dir Each node that lock its tokens will receive some compensation **/ contract MinersEscrow is Issuer { diff --git a/nkms/blockchain/eth/sol/source/contracts/NuCypherKMSToken.sol b/nkms/blockchain/eth/sol/source/contracts/NuCypherKMSToken.sol index 4a5da264f..58495007f 100644 --- a/nkms/blockchain/eth/sol/source/contracts/NuCypherKMSToken.sol +++ b/nkms/blockchain/eth/sol/source/contracts/NuCypherKMSToken.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.18; -import "./zeppelin/token/ERC20/BurnableToken.sol"; -import "./zeppelin/token/ERC20/StandardToken.sol"; -import "./zeppelin/token/ERC20/DetailedERC20.sol"; +import "zeppelin/token/ERC20/BurnableToken.sol"; +import "zeppelin/token/ERC20/StandardToken.sol"; +import "zeppelin/token/ERC20/DetailedERC20.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/PolicyManager.sol b/nkms/blockchain/eth/sol/source/contracts/PolicyManager.sol index 50eeab492..96298e94f 100644 --- a/nkms/blockchain/eth/sol/source/contracts/PolicyManager.sol +++ b/nkms/blockchain/eth/sol/source/contracts/PolicyManager.sol @@ -1,13 +1,13 @@ pragma solidity ^0.4.18; -import "./zeppelin/token/ERC20/SafeERC20.sol"; -import "./zeppelin/math/SafeMath.sol"; -import "./zeppelin/math/Math.sol"; +import "zeppelin/token/ERC20/SafeERC20.sol"; +import "zeppelin/math/SafeMath.sol"; +import "zeppelin/math/Math.sol"; import "./lib/AdditionalMath.sol"; -import "./MinersEscrow.sol"; -import "./NuCypherKMSToken.sol"; -import "./proxy/Upgradeable.sol"; +import "contracts/MinersEscrow.sol"; +import "contracts/NuCypherKMSToken.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/UserEscrow.sol b/nkms/blockchain/eth/sol/source/contracts/UserEscrow.sol index c59666187..23c8f766d 100644 --- a/nkms/blockchain/eth/sol/source/contracts/UserEscrow.sol +++ b/nkms/blockchain/eth/sol/source/contracts/UserEscrow.sol @@ -1,12 +1,12 @@ pragma solidity ^0.4.18; +import "zeppelin/token/ERC20/SafeERC20.sol"; +import "zeppelin/ownership/Ownable.sol"; +import "zeppelin/math/SafeMath.sol"; +import "contracts/NuCypherKMSToken.sol"; +import "contracts/MinersEscrow.sol"; +import "contracts/PolicyManager.sol"; -import "./zeppelin/token/ERC20/SafeERC20.sol"; -import "./zeppelin/ownership/Ownable.sol"; -import "./zeppelin/math/SafeMath.sol"; -import "./NuCypherKMSToken.sol"; -import "./MinersEscrow.sol"; -import "./PolicyManager.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/lib/AdditionalMath.sol b/nkms/blockchain/eth/sol/source/contracts/lib/AdditionalMath.sol index 7a8d0ebbc..a14a1f90c 100644 --- a/nkms/blockchain/eth/sol/source/contracts/lib/AdditionalMath.sol +++ b/nkms/blockchain/eth/sol/source/contracts/lib/AdditionalMath.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "../zeppelin/math/SafeMath.sol"; +import "zeppelin/math/SafeMath.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/Dispatcher.sol b/nkms/blockchain/eth/sol/source/proxy/Dispatcher.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/Dispatcher.sol rename to nkms/blockchain/eth/sol/source/proxy/Dispatcher.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/Government.sol b/nkms/blockchain/eth/sol/source/proxy/Government.sol similarity index 99% rename from nkms/blockchain/eth/sol/source/contracts/proxy/Government.sol rename to nkms/blockchain/eth/sol/source/proxy/Government.sol index b78c2b29d..b6efa943c 100644 --- a/nkms/blockchain/eth/sol/source/contracts/proxy/Government.sol +++ b/nkms/blockchain/eth/sol/source/proxy/Government.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "../zeppelin/math/SafeMath.sol"; +import "zeppelin/math/SafeMath.sol"; import "./Dispatcher.sol"; import "./Upgradeable.sol"; diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/README.MD b/nkms/blockchain/eth/sol/source/proxy/README.MD similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/README.MD rename to nkms/blockchain/eth/sol/source/proxy/README.MD diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/UPDATE.MD b/nkms/blockchain/eth/sol/source/proxy/UPDATE.MD similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/UPDATE.MD rename to nkms/blockchain/eth/sol/source/proxy/UPDATE.MD diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/Upgradeable.sol b/nkms/blockchain/eth/sol/source/proxy/Upgradeable.sol similarity index 98% rename from nkms/blockchain/eth/sol/source/contracts/proxy/Upgradeable.sol rename to nkms/blockchain/eth/sol/source/proxy/Upgradeable.sol index 75ca43135..fa77c9309 100644 --- a/nkms/blockchain/eth/sol/source/contracts/proxy/Upgradeable.sol +++ b/nkms/blockchain/eth/sol/source/proxy/Upgradeable.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "../zeppelin/ownership/Ownable.sol"; +import "zeppelin/ownership/Ownable.sol"; /** diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher.png b/nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher.png diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher2.png b/nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher2.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher2.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher2.png diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher3.png b/nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher3.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Dispatcher3.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Dispatcher3.png diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork.png b/nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork.png diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork2.png b/nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork2.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork2.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork2.png diff --git a/nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork3.png b/nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork3.png similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/proxy/pics/Hard-fork3.png rename to nkms/blockchain/eth/sol/source/proxy/pics/Hard-fork3.png diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/math/Math.sol b/nkms/blockchain/eth/sol/source/zeppelin/math/Math.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/math/Math.sol rename to nkms/blockchain/eth/sol/source/zeppelin/math/Math.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/math/SafeMath.sol b/nkms/blockchain/eth/sol/source/zeppelin/math/SafeMath.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/math/SafeMath.sol rename to nkms/blockchain/eth/sol/source/zeppelin/math/SafeMath.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/ownership/Ownable.sol b/nkms/blockchain/eth/sol/source/zeppelin/ownership/Ownable.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/ownership/Ownable.sol rename to nkms/blockchain/eth/sol/source/zeppelin/ownership/Ownable.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/BasicToken.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/BasicToken.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/BasicToken.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/BasicToken.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/BurnableToken.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/BurnableToken.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/BurnableToken.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/BurnableToken.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/DetailedERC20.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/DetailedERC20.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/DetailedERC20.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/DetailedERC20.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/ERC20.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/ERC20.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/ERC20.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/ERC20.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/ERC20Basic.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/ERC20Basic.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/ERC20Basic.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/ERC20Basic.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/SafeERC20.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/SafeERC20.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/SafeERC20.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/SafeERC20.sol diff --git a/nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/StandardToken.sol b/nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/StandardToken.sol similarity index 100% rename from nkms/blockchain/eth/sol/source/contracts/zeppelin/token/ERC20/StandardToken.sol rename to nkms/blockchain/eth/sol/source/zeppelin/token/ERC20/StandardToken.sol diff --git a/tests/blockchain/eth/contracts/contracts/IssuerBad.sol b/tests/blockchain/eth/contracts/contracts/IssuerBad.sol index 247211b32..823914f6e 100644 --- a/tests/blockchain/eth/contracts/contracts/IssuerBad.sol +++ b/tests/blockchain/eth/contracts/contracts/IssuerBad.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/ContracV2Bad.sol b/tests/blockchain/eth/contracts/contracts/proxy/ContracV2Bad.sol index 962db451e..b4bb506cc 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/ContracV2Bad.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/ContracV2Bad.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.18; import "./ContractInterface.sol"; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; contract ContractV2Bad is ContractInterface, Upgradeable { diff --git a/tests/blockchain/eth/contracts/contracts/proxy/ContractV1.sol b/tests/blockchain/eth/contracts/contracts/proxy/ContractV1.sol index a644cf42b..65e3013ce 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/ContractV1.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/ContractV1.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.18; import "./ContractInterface.sol"; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/ContractV2.sol b/tests/blockchain/eth/contracts/contracts/proxy/ContractV2.sol index a68962ed7..13e1eb1fa 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/ContractV2.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/ContractV2.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.18; import "./ContractInterface.sol"; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/GovernmentBad.sol b/tests/blockchain/eth/contracts/contracts/proxy/GovernmentBad.sol index 4c5e79f6c..957028fc0 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/GovernmentBad.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/GovernmentBad.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/GovernmentV2Mock.sol b/tests/blockchain/eth/contracts/contracts/proxy/GovernmentV2Mock.sol index 69d3a288c..f0bda817d 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/GovernmentV2Mock.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/GovernmentV2Mock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "contracts/proxy/Government.sol"; +import "proxy/Government.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/MinersEscrowV1Mock.sol b/tests/blockchain/eth/contracts/contracts/proxy/MinersEscrowV1Mock.sol index 04fa99f8d..4aa915a57 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/MinersEscrowV1Mock.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/MinersEscrowV1Mock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /** diff --git a/tests/blockchain/eth/contracts/contracts/proxy/PolicyManagerV1Mock.sol b/tests/blockchain/eth/contracts/contracts/proxy/PolicyManagerV1Mock.sol index 761b96e5d..1c633da7f 100644 --- a/tests/blockchain/eth/contracts/contracts/proxy/PolicyManagerV1Mock.sol +++ b/tests/blockchain/eth/contracts/contracts/proxy/PolicyManagerV1Mock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "contracts/proxy/Upgradeable.sol"; +import "proxy/Upgradeable.sol"; /**