From 2e384b81883bcde748288114c640ebba8223b37c Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Wed, 10 Apr 2019 11:00:08 +0200 Subject: [PATCH] Emulate teller-network, coverage still failing --- contracts/DAppStore.sol | 4 ++-- contracts/{token => common}/Controlled.sol | 0 contracts/{utils => token}/ApproveAndCallFallBack.sol | 0 contracts/{utils => token}/ERC20Token.sol | 0 contracts/token/MiniMeToken.sol | 6 +++--- contracts/{utils => token}/MiniMeTokenInterface.sol | 0 test/dappstore_spec.js | 3 +-- 7 files changed, 6 insertions(+), 7 deletions(-) rename contracts/{token => common}/Controlled.sol (100%) rename contracts/{utils => token}/ApproveAndCallFallBack.sol (100%) rename contracts/{utils => token}/ERC20Token.sol (100%) rename contracts/{utils => token}/MiniMeTokenInterface.sol (100%) diff --git a/contracts/DAppStore.sol b/contracts/DAppStore.sol index 2ada5d4..54267d2 100644 --- a/contracts/DAppStore.sol +++ b/contracts/DAppStore.sol @@ -1,7 +1,7 @@ pragma solidity ^0.5.2; -import "./utils/MiniMeTokenInterface.sol"; -import "./utils/ApproveAndCallFallBack.sol"; +import "./token/MiniMeTokenInterface.sol"; +import "./token/ApproveAndCallFallBack.sol"; import "./utils/SafeMath.sol"; import "./utils/BancorFormula.sol"; diff --git a/contracts/token/Controlled.sol b/contracts/common/Controlled.sol similarity index 100% rename from contracts/token/Controlled.sol rename to contracts/common/Controlled.sol diff --git a/contracts/utils/ApproveAndCallFallBack.sol b/contracts/token/ApproveAndCallFallBack.sol similarity index 100% rename from contracts/utils/ApproveAndCallFallBack.sol rename to contracts/token/ApproveAndCallFallBack.sol diff --git a/contracts/utils/ERC20Token.sol b/contracts/token/ERC20Token.sol similarity index 100% rename from contracts/utils/ERC20Token.sol rename to contracts/token/ERC20Token.sol diff --git a/contracts/token/MiniMeToken.sol b/contracts/token/MiniMeToken.sol index a15395c..d2dbf21 100644 --- a/contracts/token/MiniMeToken.sol +++ b/contracts/token/MiniMeToken.sol @@ -23,10 +23,10 @@ pragma solidity ^0.5.2; * @dev It is ERC20 compliant, but still needs to under go further testing. */ -import "./Controlled.sol"; +import "../common/Controlled.sol"; import "./TokenController.sol"; -import "../utils/ApproveAndCallFallBack.sol"; -import "../utils/MiniMeTokenInterface.sol"; +import "./ApproveAndCallFallBack.sol"; +import "./MiniMeTokenInterface.sol"; import "./TokenFactory.sol"; /** diff --git a/contracts/utils/MiniMeTokenInterface.sol b/contracts/token/MiniMeTokenInterface.sol similarity index 100% rename from contracts/utils/MiniMeTokenInterface.sol rename to contracts/token/MiniMeTokenInterface.sol diff --git a/test/dappstore_spec.js b/test/dappstore_spec.js index c9bf331..a4dd949 100644 --- a/test/dappstore_spec.js +++ b/test/dappstore_spec.js @@ -32,8 +32,7 @@ config({ "DAppStore": { args: [ "$SNT" ] }, - "TestBancorFormula": { }, - "Controlled": { } + "TestBancorFormula": { } } }, (_err, web3_accounts) => { accounts = web3_accounts