NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename canBuy to purchaseValid

Browse Source
This commit is contained in:
Francisco Giordano
2017-06-30 17:54:26 -03:00
parent 657c56c650
commit 54d74b1c26
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/crowdsale/CappedCrowdsale.sol
View File

@ -16,11 +16,11 @@ contract CappedCrowdsale is Crowdsale {
cap = _cap; cap = _cap;
} }
// overriding Crowdsale#canBuy to add extra cap logic // overriding Crowdsale#purchaseValid to add extra cap logic
// @return true if investors can buy at the moment // @return true if investors can buy at the moment
function canBuy() internal constant returns (bool) { function purchaseValid() internal constant returns (bool) {
bool withinCap = weiRaised.add(msg.value) <= cap; bool withinCap = weiRaised.add(msg.value) <= cap;
return super.canBuy() && withinCap; return super.purchaseValid() && withinCap;
} }
// overriding Crowdsale#hasEnded to add cap logic // overriding Crowdsale#hasEnded to add cap logic

4
contracts/crowdsale/Crowdsale.sol
View File

@ -67,7 +67,7 @@ contract Crowdsale {
// low level token purchase function // low level token purchase function
function buyTokens(address beneficiary) payable { function buyTokens(address beneficiary) payable {
require(canBuy()); require(purchaseValid());
uint256 weiAmount = msg.value; uint256 weiAmount = msg.value;
uint256 updatedWeiRaised = weiRaised.add(weiAmount); uint256 updatedWeiRaised = weiRaised.add(weiAmount);
@ -91,7 +91,7 @@ contract Crowdsale {
} }
// @return true if the transaction can buy tokens // @return true if the transaction can buy tokens
function canBuy() internal constant returns (bool) { function purchaseValid() internal constant returns (bool) {
uint256 current = block.number; uint256 current = block.number;
bool withinPeriod = current >= startBlock && current <= endBlock; bool withinPeriod = current >= startBlock && current <= endBlock;
bool nonZeroPurchase = msg.value != 0; bool nonZeroPurchase = msg.value != 0;