From a5602e7e7b13cc35c19b5e00af534b384105016e Mon Sep 17 00:00:00 2001 From: Arseniy Klempner Date: Mon, 26 Dec 2016 13:59:21 -0800 Subject: [PATCH] Make resetSpentToday and setDailyLimit internal functions --- contracts/DayLimit.sol | 4 ++-- contracts/MultisigWallet.sol | 4 ++-- contracts/test-helpers/DayLimitMock.sol | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/contracts/DayLimit.sol b/contracts/DayLimit.sol index 7a301fb58..41f9e4994 100644 --- a/contracts/DayLimit.sol +++ b/contracts/DayLimit.sol @@ -39,12 +39,12 @@ contract DayLimit { // METHODS // (re)sets the daily limit. doesn't alter the amount already spent today. - function setDailyLimit(uint _newLimit) external { + function _setDailyLimit(uint _newLimit) internal { dailyLimit = _newLimit; } // resets the amount already spent today. - function resetSpentToday() external { + function _resetSpentToday() internal { spentToday = 0; } diff --git a/contracts/MultisigWallet.sol b/contracts/MultisigWallet.sol index c5e76b060..867de28ff 100644 --- a/contracts/MultisigWallet.sol +++ b/contracts/MultisigWallet.sol @@ -84,11 +84,11 @@ contract MultisigWallet is Multisig, Shareable, DayLimit { } function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external { - this.setDailyLimit(_newLimit); + _setDailyLimit(_newLimit); } function resetSpentToday() onlymanyowners(sha3(msg.data)) external { - this.resetSpentToday(); + _resetSpentToday(); } diff --git a/contracts/test-helpers/DayLimitMock.sol b/contracts/test-helpers/DayLimitMock.sol index 74cd71e6b..0ba5ca23f 100644 --- a/contracts/test-helpers/DayLimitMock.sol +++ b/contracts/test-helpers/DayLimitMock.sol @@ -12,4 +12,12 @@ contract DayLimitMock is DayLimit { totalSpending += _value; } + function setDailyLimit(uint _newLimit) external { + _setDailyLimit(_newLimit); + } + + function resetSpentToday() external { + _resetSpentToday(); + } + }