From f982c5ecac07c00f97221df5dc90a55b094b45b3 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 31 Jan 2018 16:36:04 +0200 Subject: [PATCH] tests --- contracts/PriceEstimator/PriceEstimator.sol | 2 +- migrations/2_household.js | 9 --------- migrations/{3_waterSystem.js => 2_waterSystem.js} | 0 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 migrations/2_household.js rename migrations/{3_waterSystem.js => 2_waterSystem.js} (100%) diff --git a/contracts/PriceEstimator/PriceEstimator.sol b/contracts/PriceEstimator/PriceEstimator.sol index e32f4df..6442424 100644 --- a/contracts/PriceEstimator/PriceEstimator.sol +++ b/contracts/PriceEstimator/PriceEstimator.sol @@ -27,7 +27,7 @@ contract PriceEstimator is IPriceEstimator, OwnableUpgradeableImplementation { function estimate(address _meter, uint _liters) public view returns(uint256 amount, uint256 price) { require(_meter != address(0)); - require(_liters > 3000); + require(_liters >= 3000); require(_liters % 1000 == 0); uint256 householdSize = householdMetersContract.getHouseholdMembersCount(_meter); diff --git a/migrations/2_household.js b/migrations/2_household.js deleted file mode 100644 index 178f7eb..0000000 --- a/migrations/2_household.js +++ /dev/null @@ -1,9 +0,0 @@ -var HouseholdMeters = artifacts.require("./HouseholdMeters.sol"); -let PriceEstimator = artifacts.require("./PriceEstimator/PriceEstimator.sol"); - -module.exports = async function (deployer) { - await deployer.deploy(HouseholdMeters); - let HouseholdMetersInstance = await HouseholdMeters.deployed(); - - await deployer.deploy(PriceEstimator, HouseholdMetersInstance.address); -}; \ No newline at end of file diff --git a/migrations/3_waterSystem.js b/migrations/2_waterSystem.js similarity index 100% rename from migrations/3_waterSystem.js rename to migrations/2_waterSystem.js