mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Docs, changelog and tests
This commit is contained in:
@@ -69,8 +69,8 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
|
||||
internal
|
||||
returns (bool)
|
||||
{
|
||||
if (now > lastDay + 24 hours) {
|
||||
lastDay = now;
|
||||
if (block.timestamp > lastDay + 24 hours) {
|
||||
lastDay = block.timestamp;
|
||||
spentToday = 0;
|
||||
}
|
||||
if (spentToday + amount > dailyLimit || spentToday + amount < spentToday)
|
||||
@@ -88,7 +88,7 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
|
||||
view
|
||||
returns (uint)
|
||||
{
|
||||
if (now > lastDay + 24 hours)
|
||||
if (block.timestamp > lastDay + 24 hours)
|
||||
return dailyLimit;
|
||||
if (dailyLimit < spentToday)
|
||||
return 0;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
contract C {
|
||||
function f() public {
|
||||
now;
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// TypeError: (38-41): "now" has been deprecated. Use "block.timestamp" instead.
|
||||
@@ -0,0 +1,8 @@
|
||||
contract C {
|
||||
function f() public view {
|
||||
uint now = block.timestamp;
|
||||
now;
|
||||
}
|
||||
}
|
||||
// ----
|
||||
// Warning: (43-51): This declaration shadows a builtin symbol.
|
||||
@@ -1,7 +1,7 @@
|
||||
contract C {
|
||||
uint x;
|
||||
function g() pure public {}
|
||||
function f() view public returns (uint) { return now; }
|
||||
function f() view public returns (uint) { return block.timestamp; }
|
||||
function h() public { x = 2; }
|
||||
function i() payable public { x = 2; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user