getDebtMultiplier fix

Thetta · Dec 20, 2018 · acac231 · acac231
1 parent e36ea1f
commit acac231
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/contracts/ether/WeiExpense.sol b/contracts/ether/WeiExpense.sol
@@ -146,7 +146,7 @@ contract WeiExpense is IWeiReceiver, IDestination, Ownable {
 
 	function getDebtMultiplier()public view returns(uint) {
 		// if periodic, period already passed from last receive, but amount is not sliding
-		if((isPeriodic) && (!isSlidingAmount) && (((block.timestamp - momentReceived) / (periodHours * 3600 * 1000)) > 1)) {
+		if((isPeriodic) && (!isSlidingAmount) && (((block.timestamp - momentReceived) / (periodHours * 3600 * 1000)) >= 1)) {
 			if(0 != partsPerMillion) {
 				return 1;
 			} else {

diff --git a/test/moneyflow.tests.js b/test/moneyflow.tests.js
@@ -264,7 +264,7 @@ contract('Moneyflow', (accounts) => {
 		var needsEmployee1 = await Employee1.isNeedsMoney({ from: creator });
 		assert.equal(needsEmployee1, false, 'Dont need money, because he got it');
 
-		await passHours(timePeriod);
+		await passHours(timePeriod + 1);
 		var needsEmployee2 = await Employee1.isNeedsMoney({ from: creator });
 		assert.equal(needsEmployee2, true, 'Need money, because 24 hours passed');
 
@@ -307,15 +307,15 @@ contract('Moneyflow', (accounts) => {
 		var need = await Employee1.getTotalWeiNeeded(10000*money);
 		assert.equal(need.toNumber(), 0);
 
-		await passHours(1*timePeriod);
+		await passHours(1*timePeriod + 1);
 		var need = await Employee1.getTotalWeiNeeded(10000*money);
 		assert.equal(need.toNumber(), 1000*money);
 
-		await passHours(1*timePeriod);
+		await passHours(1*timePeriod + 1);
 		var need = await Employee1.getTotalWeiNeeded(10000*money);
 		assert.equal(need.toNumber(), 2000*money);
 
-		await passHours(1*timePeriod);
+		await passHours(1*timePeriod + 1);
 		var need = await Employee1.getTotalWeiNeeded(10000*money);
 		assert.equal(need.toNumber(), 3000*money);