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

Improve encapsulation on Crowdsales (#1268)

Browse Source 
* Improve encapsulation on Crowdsales

* add missing tests

* remove only

* Do not prefix getters
This commit is contained in:
Leo Arias
2018-09-05 15:34:21 -06:00
committed by Francisco Giordano
parent 7bb87237f3
commit b8a70f0e55
12 changed files with 141 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contracts/crowdsale/validation/CappedCrowdsale.sol
View File

@ -11,7 +11,7 @@ import "../Crowdsale.sol";
contract CappedCrowdsale is Crowdsale {
using SafeMath for uint256;
uint256 public cap;
uint256 private cap_;
/**
* @dev Constructor, takes maximum amount of wei accepted in the crowdsale.
@ -19,7 +19,14 @@ contract CappedCrowdsale is Crowdsale {
*/
constructor(uint256 _cap) public {
require(_cap > 0);
cap = _cap;
cap_ = _cap;
}
/**
* @return the cap of the crowdsale.
*/
function cap() public view returns(uint256) {
return cap_;
}
/**
@ -27,7 +34,7 @@ contract CappedCrowdsale is Crowdsale {
* @return Whether the cap was reached
*/
function capReached() public view returns (bool) {
return weiRaised >= cap;
return weiRaised() >= cap_;
}
/**
@ -42,7 +49,7 @@ contract CappedCrowdsale is Crowdsale {
internal
{
super._preValidatePurchase(_beneficiary, _weiAmount);
require(weiRaised.add(_weiAmount) <= cap);
require(weiRaised().add(_weiAmount) <= cap_);
}
}

18
contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
View File

@ -12,8 +12,8 @@ import "../../ownership/Ownable.sol";
contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
using SafeMath for uint256;
mapping(address => uint256) public contributions;
mapping(address => uint256) public caps;
mapping(address => uint256) private contributions_;
mapping(address => uint256) private caps_;
/**
* @dev Sets a specific user's maximum contribution.
@ -21,7 +21,7 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
* @param _cap Wei limit for individual contribution
*/
function setUserCap(address _beneficiary, uint256 _cap) external onlyOwner {
caps[_beneficiary] = _cap;
caps_[_beneficiary] = _cap;
}
/**
@ -37,7 +37,7 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
onlyOwner
{
for (uint256 i = 0; i < _beneficiaries.length; i++) {
caps[_beneficiaries[i]] = _cap;
caps_[_beneficiaries[i]] = _cap;
}
}
@ -47,7 +47,7 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
* @return Current cap for individual user
*/
function getUserCap(address _beneficiary) public view returns (uint256) {
return caps[_beneficiary];
return caps_[_beneficiary];
}
/**
@ -58,7 +58,7 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
function getUserContribution(address _beneficiary)
public view returns (uint256)
{
return contributions[_beneficiary];
return contributions_[_beneficiary];
}
/**
@ -73,7 +73,8 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
internal
{
super._preValidatePurchase(_beneficiary, _weiAmount);
require(contributions[_beneficiary].add(_weiAmount) <= caps[_beneficiary]);
require(
contributions_[_beneficiary].add(_weiAmount) <= caps_[_beneficiary]);
}
/**
@ -88,7 +89,8 @@ contract IndividuallyCappedCrowdsale is Ownable, Crowdsale {
internal
{
super._updatePurchasingState(_beneficiary, _weiAmount);
contributions[_beneficiary] = contributions[_beneficiary].add(_weiAmount);
contributions_[_beneficiary] = contributions_[_beneficiary].add(
_weiAmount);
}
}