diff options
| author | chriseth <chris@ethereum.org> | 2018-07-03 00:26:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 00:26:46 +0800 |
| commit | 0f3872694bb668274e10e72b1a2c3092b7d5162b (patch) | |
| tree | 31601686a2fdab3d84cdd13b964115b11363ef33 /test/contracts | |
| parent | 08aa7e47e482d1cc7861856a666875f3b1ea7d2b (diff) | |
| parent | e251cdcf47667ad3e7c88446d8b26cb3ae1bd0f2 (diff) | |
| download | dexon-solidity-0f3872694bb668274e10e72b1a2c3092b7d5162b.tar.gz dexon-solidity-0f3872694bb668274e10e72b1a2c3092b7d5162b.tar.zst dexon-solidity-0f3872694bb668274e10e72b1a2c3092b7d5162b.zip | |
Merge pull request #4374 from ethereum/v050-var-keyword-removal-preps-end2end-tests
V050 var keyword removal preparations (End-to-End tests)
Diffstat (limited to 'test/contracts')
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 8 | ||||
| -rw-r--r-- | test/contracts/Wallet.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index 0b888b90..bd996fb1 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -67,7 +67,7 @@ contract AuctionSystem { function onAuctionEnd(string _name) internal; function bid(string _name, address _bidder, uint _value) internal { - var auction = m_auctions[_name]; + Auction storage auction = m_auctions[_name]; if (auction.endDate > 0 && now > auction.endDate) { emit AuctionEnded(_name, auction.highestBidder); @@ -117,9 +117,9 @@ contract GlobalRegistrar is Registrar, AuctionSystem { } function onAuctionEnd(string _name) internal { - var auction = m_auctions[_name]; - var record = m_toRecord[_name]; - var previousOwner = record.owner; + Auction storage auction = m_auctions[_name]; + Record storage record = m_toRecord[_name]; + address previousOwner = record.owner; record.renewalDate = now + c_renewalInterval; record.owner = auction.highestBidder; emit Changed(_name); diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp index 470551df..1db1e4e2 100644 --- a/test/contracts/Wallet.cpp +++ b/test/contracts/Wallet.cpp @@ -119,7 +119,7 @@ contract multiowned { // make sure they're an owner if (ownerIndex == 0) return; uint ownerIndexBit = 2**ownerIndex; - var pending = m_pending[_operation]; + PendingState pending = m_pending[_operation]; if (pending.ownersDone & ownerIndexBit > 0) { pending.yetNeeded++; pending.ownersDone -= ownerIndexBit; @@ -178,7 +178,7 @@ contract multiowned { } function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) { - var pending = m_pending[_operation]; + PendingState pending = m_pending[_operation]; uint ownerIndex = m_ownerIndex[uint(_owner)]; // make sure they're an owner @@ -201,7 +201,7 @@ contract multiowned { // make sure they're an owner if (ownerIndex == 0) return; - var pending = m_pending[_operation]; + PendingState pending = m_pending[_operation]; // if we're not yet working on this operation, switch over and reset the confirmation status. if (pending.yetNeeded == 0) { // reset count of confirmations needed. |