Skip to content

Commit 0f38726

Browse files
chrisethchriseth
authored
Merge pull request #4374 from ethereum/v050-var-keyword-removal-preps-end2end-tests
V050 var keyword removal preparations (End-to-End tests)
2 parents 08aa7e4 + e251cdc commit 0f38726

7 files changed

Lines changed: 75 additions & 84 deletions

‎test/contracts/AuctionRegistrar.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ contract AuctionSystem {
6767
function onAuctionEnd(string _name) internal;
6868
6969
function bid(string _name, address _bidder, uint _value) internal {
70-
var auction = m_auctions[_name];
70+
Auction storage auction = m_auctions[_name];
7171
if (auction.endDate > 0 && now > auction.endDate)
7272
{
7373
emit AuctionEnded(_name, auction.highestBidder);
@@ -117,9 +117,9 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
117117
}
118118
119119
function onAuctionEnd(string _name) internal {
120-
var auction = m_auctions[_name];
121-
var record = m_toRecord[_name];
122-
var previousOwner = record.owner;
120+
Auction storage auction = m_auctions[_name];
121+
Record storage record = m_toRecord[_name];
122+
address previousOwner = record.owner;
123123
record.renewalDate = now + c_renewalInterval;
124124
record.owner = auction.highestBidder;
125125
emit Changed(_name);

‎test/contracts/Wallet.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ contract multiowned {
119119
// make sure they're an owner
120120
if (ownerIndex == 0) return;
121121
uint ownerIndexBit = 2**ownerIndex;
122-
var pending = m_pending[_operation];
122+
PendingState pending = m_pending[_operation];
123123
if (pending.ownersDone & ownerIndexBit > 0) {
124124
pending.yetNeeded++;
125125
pending.ownersDone -= ownerIndexBit;
@@ -178,7 +178,7 @@ contract multiowned {
178178
}
179179
180180
function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {
181-
var pending = m_pending[_operation];
181+
PendingState pending = m_pending[_operation];
182182
uint ownerIndex = m_ownerIndex[uint(_owner)];
183183
184184
// make sure they're an owner
@@ -201,7 +201,7 @@ contract multiowned {
201201
// make sure they're an owner
202202
if (ownerIndex == 0) return;
203203
204-
var pending = m_pending[_operation];
204+
PendingState pending = m_pending[_operation];
205205
// if we're not yet working on this operation, switch over and reset the confirmation status.
206206
if (pending.yetNeeded == 0) {
207207
// reset count of confirmations needed.

‎test/libsolidity/ABIDecoderTests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ BOOST_AUTO_TEST_CASE(decode_function_type_array)
372372
}
373373
// uses "decode from memory"
374374
function test1_dynamic() public returns (uint) {
375-
var x = new function() external returns (uint)[](3);
375+
function () external returns (uint)[] memory x = new function() external returns (uint)[](4);
376376
x[0] = this.f1;
377377
x[1] = this.f2;
378378
x[2] = this.f3;
@@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE(decode_function_type_array)
385385
}
386386
// uses "decode from calldata"
387387
function test2_dynamic() public returns (uint) {
388-
var x = new function() external returns (uint)[](3);
388+
function () external returns (uint)[] memory x = new function() external returns (uint)[](3);
389389
x[0] = this.f1;
390390
x[1] = this.f2;
391391
x[2] = this.f3;
@@ -552,7 +552,7 @@ BOOST_AUTO_TEST_CASE(storage_ptr)
552552
r[2] = 3;
553553
s.x = 11;
554554
s.y = 12;
555-
var (a, b, c, d) = L.f(r, s);
555+
(uint a, uint b, uint c, uint d) = L.f(r, s);
556556
return (r[2], s.x, a, b, c, d);
557557
}
558558
}

0 commit comments

Comments
 (0)