diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-22 03:03:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 03:03:03 +0800 |
| commit | ae43330b62742c5ac799018d1793b5bb0943ee8a (patch) | |
| tree | 6b6d666f0a18ed0e1b25b75beb5a1b5cc44f8b88 /test | |
| parent | ad593fdf1996618f8f0f09d69f90e2ed5511a403 (diff) | |
| parent | 72e87423db8d938a4ef5eea92a56332c607accdb (diff) | |
| download | dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar.gz dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar.bz2 dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar.lz dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar.xz dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.tar.zst dexon-solidity-ae43330b62742c5ac799018d1793b5bb0943ee8a.zip | |
Merge pull request #4328 from ethereum/disallow-years
[BREAKING] Disallow the years unit denomination properly
Diffstat (limited to 'test')
4 files changed, 3 insertions, 10 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index 5e4991e2..33b392d4 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -109,7 +109,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem { uint renewalDate; } - uint constant c_renewalInterval = 1 years; + uint constant c_renewalInterval = 365 days; uint constant c_freeBytes = 12; function Registrar() { diff --git a/test/libsolidity/syntaxTests/denominations/denominations.sol b/test/libsolidity/syntaxTests/denominations/denominations.sol index 6d1aa2f3..43049a14 100644 --- a/test/libsolidity/syntaxTests/denominations/denominations.sol +++ b/test/libsolidity/syntaxTests/denominations/denominations.sol @@ -1,7 +1,6 @@ contract C { uint constant a = 1 wei + 2 szabo + 3 finney + 4 ether; - uint constant b = 1 seconds + 2 minutes + 3 hours + 4 days + 5 weeks + 6 years; + uint constant b = 1 seconds + 2 minutes + 3 hours + 4 days + 5 weeks; uint constant c = 2 szabo / 1 seconds + 3 finney * 3 hours; } // ---- -// Warning: (142-149): Using "years" as a unit denomination is deprecated. diff --git a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol b/test/libsolidity/syntaxTests/denominations/deprecated_year.sol index 30e86535..691c0cb0 100644 --- a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol +++ b/test/libsolidity/syntaxTests/denominations/deprecated_year.sol @@ -2,4 +2,4 @@ contract C { uint constant a = 3 years; } // ---- -// Warning: (32-39): Using "years" as a unit denomination is deprecated. +// TypeError: (32-39): Using "years" as a unit denomination is deprecated. diff --git a/test/libsolidity/syntaxTests/denominations/deprecated_year_050.sol b/test/libsolidity/syntaxTests/denominations/deprecated_year_050.sol deleted file mode 100644 index 4baaeaa3..00000000 --- a/test/libsolidity/syntaxTests/denominations/deprecated_year_050.sol +++ /dev/null @@ -1,6 +0,0 @@ -pragma experimental "v0.5.0"; -contract C { - uint constant a = 3 years; -} -// ---- -// TypeError: (62-69): Using "years" as a unit denomination is deprecated. |