Decouple Shareable from DayLimit
This commit is contained in:
@ -11,7 +11,7 @@ import './Shareable.sol';
|
||||
* on a particular resource per calendar day. is multiowned to allow the limit to be altered. resource that method
|
||||
* uses is specified in the modifier.
|
||||
*/
|
||||
contract DayLimit is Shareable {
|
||||
contract DayLimit {
|
||||
// FIELDS
|
||||
|
||||
uint public dailyLimit;
|
||||
@ -38,13 +38,13 @@ contract DayLimit is Shareable {
|
||||
|
||||
// METHODS
|
||||
|
||||
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
||||
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
|
||||
// (re)sets the daily limit. doesn't alter the amount already spent today.
|
||||
function setDailyLimit(uint _newLimit) external {
|
||||
dailyLimit = _newLimit;
|
||||
}
|
||||
|
||||
// resets the amount already spent today. needs many of the owners to confirm
|
||||
function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
|
||||
// resets the amount already spent today.
|
||||
function resetSpentToday() external {
|
||||
spentToday = 0;
|
||||
}
|
||||
|
||||
@ -53,14 +53,14 @@ contract DayLimit is Shareable {
|
||||
|
||||
// checks to see if there is at least `_value` left from the daily limit today. if there is, subtracts it and
|
||||
// returns true. otherwise just returns false.
|
||||
function underLimit(uint _value) internal onlyOwner returns (bool) {
|
||||
function underLimit(uint _value) internal returns (bool) {
|
||||
// reset the spend limit if we're on a different day to last time.
|
||||
if (today() > lastDay) {
|
||||
spentToday = 0;
|
||||
lastDay = today();
|
||||
}
|
||||
// check to see if there's enough left - if so, subtract and return true.
|
||||
// overflow protection // dailyLimit check
|
||||
// overflow protection // dailyLimit check
|
||||
if (spentToday + _value >= spentToday && spentToday + _value <= dailyLimit) {
|
||||
spentToday += _value;
|
||||
return true;
|
||||
|
||||
@ -83,6 +83,14 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
|
||||
}
|
||||
}
|
||||
|
||||
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
|
||||
this.setDailyLimit(_newLimit);
|
||||
}
|
||||
|
||||
function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
|
||||
this.resetSpentToday();
|
||||
}
|
||||
|
||||
|
||||
// INTERNAL METHODS
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ import "../DayLimit.sol";
|
||||
contract DayLimitMock is DayLimit {
|
||||
uint public totalSpending;
|
||||
|
||||
function DayLimitMock(uint _value, address[] _owners, uint _required) DayLimit(_value) Shareable(_owners, _required) {
|
||||
function DayLimitMock(uint _value) DayLimit(_value) {
|
||||
totalSpending = 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user