cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3053 from wjmelements/nit-examples

Browse Source 
Replace biddingTime with auctionEnd in auction example
This commit is contained in:
chriseth 2017-10-20 18:06:45 +02:00 committed by GitHub
commit 4f30582db4
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/solidity-by-example.rst
View File

@ -221,8 +221,7 @@ activate themselves.
// absolute unix timestamps (seconds since 1970-01-01) // absolute unix timestamps (seconds since 1970-01-01)
// or time periods in seconds. // or time periods in seconds.
address public beneficiary; address public beneficiary;
uint public auctionStart; uint public auctionEnd;
uint public biddingTime;
// Current state of the auction. // Current state of the auction.
address public highestBidder; address public highestBidder;
@ -251,8 +250,7 @@ activate themselves.
address _beneficiary address _beneficiary
) { ) {
beneficiary = _beneficiary; beneficiary = _beneficiary;
auctionStart = now; auctionEnd = now + _biddingTime;
biddingTime = _biddingTime;
} }
/// Bid on the auction with the value sent /// Bid on the auction with the value sent
@ -268,7 +266,7 @@ activate themselves.
// Revert the call if the bidding // Revert the call if the bidding
// period is over. // period is over.
require(now <= (auctionStart + biddingTime)); require(now <= auctionEnd);
// If the bid is not higher, send the // If the bid is not higher, send the
// money back. // money back.
@ -322,7 +320,7 @@ activate themselves.
// external contracts. // external contracts.
// 1. Conditions // 1. Conditions
require(now >= (auctionStart + biddingTime)); // auction did not yet end require(now >= auctionEnd); // auction did not yet end
require(!ended); // this function has already been called require(!ended); // this function has already been called
// 2. Effects // 2. Effects
@ -382,7 +380,6 @@ high or low invalid bids.
} }
address public beneficiary; address public beneficiary;
uint public auctionStart;
uint public biddingEnd; uint public biddingEnd;
uint public revealEnd; uint public revealEnd;
bool public ended; bool public ended;
@ -410,7 +407,6 @@ high or low invalid bids.
address _beneficiary address _beneficiary
) { ) {
beneficiary = _beneficiary; beneficiary = _beneficiary;
auctionStart = now;
biddingEnd = now + _biddingTime; biddingEnd = now + _biddingTime;
revealEnd = biddingEnd + _revealTime; revealEnd = biddingEnd + _revealTime;
} }