diff options
| author | Daniel Kirchner <daniel@ekpyron.org> | 2018-09-12 22:21:43 +0800 |
|---|---|---|
| committer | Daniel Kirchner <daniel@ekpyron.org> | 2018-09-12 22:21:43 +0800 |
| commit | 879251a78b2d4e26dc71299d2d7ca989d0855d61 (patch) | |
| tree | fedf7b035e527103f178f9670bce4cbbc81d283d /test/contracts | |
| parent | 1994b51ef3eb8de3617efec9747979c9fb5ed453 (diff) | |
| download | dexon-solidity-879251a78b2d4e26dc71299d2d7ca989d0855d61.tar.gz dexon-solidity-879251a78b2d4e26dc71299d2d7ca989d0855d61.tar.zst dexon-solidity-879251a78b2d4e26dc71299d2d7ca989d0855d61.zip | |
Update test suite to use address payable.
Diffstat (limited to 'test/contracts')
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 8 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 2 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index e178748f..70503605 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -66,7 +66,7 @@ contract AuctionSystem { /// Function that is called once an auction ends. function onAuctionEnd(string memory _name) internal; - function bid(string memory _name, address _bidder, uint _value) internal { + function bid(string memory _name, address payable _bidder, uint _value) internal { Auction storage auction = m_auctions[_name]; if (auction.endDate > 0 && now > auction.endDate) { @@ -91,7 +91,7 @@ contract AuctionSystem { uint constant c_biddingTime = 7 days; struct Auction { - address highestBidder; + address payable highestBidder; uint highestBid; uint secondHighestBid; uint sumOfBids; @@ -102,7 +102,7 @@ contract AuctionSystem { contract GlobalRegistrar is Registrar, AuctionSystem { struct Record { - address owner; + address payable owner; address primary; address subRegistrar; bytes32 content; @@ -156,7 +156,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem { modifier onlyrecordowner(string memory _name) { if (m_toRecord[_name].owner == msg.sender) _; } - function transfer(string memory _name, address _newOwner) onlyrecordowner(_name) public { + function transfer(string memory _name, address payable _newOwner) onlyrecordowner(_name) public { m_toRecord[_name].owner = _newOwner; emit Changed(_name); } diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 78db4761..ae921a96 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -81,7 +81,7 @@ contract FixedFeeRegistrar is Registrar { emit Changed(_name); } } - function disown(string memory _name, address _refund) onlyrecordowner(_name) public { + function disown(string memory _name, address payable _refund) onlyrecordowner(_name) public { delete m_recordData[uint(keccak256(bytes(_name))) / 8]; if (!_refund.send(c_fee)) revert(); diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index a2e764fb..e0e3045c 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -375,7 +375,7 @@ contract Wallet is multisig, multiowned, daylimit { } // destroys the contract sending everything to `_to`. - function kill(address _to) onlymanyowners(keccak256(msg.data)) external { + function kill(address payable _to) onlymanyowners(keccak256(msg.data)) external { selfdestruct(_to); } |