diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-12 17:05:49 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-25 22:17:50 +0800 |
commit | 3ee3018bf60d172270ca94ff416a3081477922d4 (patch) | |
tree | 3b19947caa078a7613abe99a60815709ce4143e2 /test/compilationTests/zeppelin | |
parent | 98c9ca257568e8f281a5d8857a45ef2c8aef2c77 (diff) | |
download | dexon-solidity-3ee3018bf60d172270ca94ff416a3081477922d4.tar.gz dexon-solidity-3ee3018bf60d172270ca94ff416a3081477922d4.tar.zst dexon-solidity-3ee3018bf60d172270ca94ff416a3081477922d4.zip |
Update external contracts in compilationTests (to support strict address literals)
Diffstat (limited to 'test/compilationTests/zeppelin')
6 files changed, 8 insertions, 8 deletions
diff --git a/test/compilationTests/zeppelin/Bounty.sol b/test/compilationTests/zeppelin/Bounty.sol index 4425b7a5..4c62a0b4 100644 --- a/test/compilationTests/zeppelin/Bounty.sol +++ b/test/compilationTests/zeppelin/Bounty.sol @@ -48,7 +48,7 @@ contract Bounty is PullPayment, Destructible { */ function claim(Target target) { address researcher = researchers[target]; - if (researcher == 0) { + if (researcher == address(0)) { throw; } // Check Target contract invariants diff --git a/test/compilationTests/zeppelin/MultisigWallet.sol b/test/compilationTests/zeppelin/MultisigWallet.sol index 939e70f2..8fcdb63e 100644 --- a/test/compilationTests/zeppelin/MultisigWallet.sol +++ b/test/compilationTests/zeppelin/MultisigWallet.sol @@ -67,7 +67,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit { } // determine our operation hash. _r = keccak256(msg.data, block.number); - if (!confirm(_r) && txs[_r].to == 0) { + if (!confirm(_r) && txs[_r].to == address(0)) { txs[_r].to = _to; txs[_r].value = _value; txs[_r].data = _data; @@ -81,7 +81,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit { * @param _h The transaction hash to approve. */ function confirm(bytes32 _h) onlymanyowners(_h) returns (bool) { - if (txs[_h].to != 0) { + if (txs[_h].to != address(0)) { if (!txs[_h].to.call.value(txs[_h].value)(txs[_h].data)) { throw; } diff --git a/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol b/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol index bee1efd2..21d36840 100644 --- a/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol +++ b/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol @@ -44,7 +44,7 @@ contract Crowdsale { require(_startBlock >= block.number); require(_endBlock >= _startBlock); require(_rate > 0); - require(_wallet != 0x0); + require(_wallet != address(0x0)); token = createTokenContract(); startBlock = _startBlock; @@ -67,7 +67,7 @@ contract Crowdsale { // low level token purchase function function buyTokens(address beneficiary) payable { - require(beneficiary != 0x0); + require(beneficiary != address(0x0)); require(validPurchase()); uint256 weiAmount = msg.value; diff --git a/test/compilationTests/zeppelin/crowdsale/RefundVault.sol b/test/compilationTests/zeppelin/crowdsale/RefundVault.sol index cc92ff9f..d88f035f 100644 --- a/test/compilationTests/zeppelin/crowdsale/RefundVault.sol +++ b/test/compilationTests/zeppelin/crowdsale/RefundVault.sol @@ -23,7 +23,7 @@ contract RefundVault is Ownable { event Refunded(address indexed beneficiary, uint256 weiAmount); function RefundVault(address _wallet) { - require(_wallet != 0x0); + require(_wallet != address(0x0)); wallet = _wallet; state = State.Active; } diff --git a/test/compilationTests/zeppelin/ownership/Claimable.sol b/test/compilationTests/zeppelin/ownership/Claimable.sol index d063502d..14d0ac6a 100644 --- a/test/compilationTests/zeppelin/ownership/Claimable.sol +++ b/test/compilationTests/zeppelin/ownership/Claimable.sol @@ -35,6 +35,6 @@ contract Claimable is Ownable { */ function claimOwnership() onlyPendingOwner { owner = pendingOwner; - pendingOwner = 0x0; + pendingOwner = address(0x0); } } diff --git a/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol b/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol index f5fee614..93177dc6 100644 --- a/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol +++ b/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol @@ -36,7 +36,7 @@ contract DelayedClaimable is Claimable { if ((block.number > end) || (block.number < start)) throw; owner = pendingOwner; - pendingOwner = 0x0; + pendingOwner = address(0x0); end = 0; } |