diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol index 7cc07f083d5..ad448b319a4 100644 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol @@ -49,8 +49,8 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale { */ function getCurrentRate() public view returns (uint256) { // solium-disable-next-line security/no-block-members - uint256 elapsedTime = block.timestamp.sub(openingTime); - uint256 timeRange = closingTime.sub(openingTime); + uint256 elapsedTime = block.timestamp.sub(openingTime()); + uint256 timeRange = closingTime().sub(openingTime()); uint256 rateRange = initialRate_.sub(finalRate_); return initialRate_.sub(elapsedTime.mul(rateRange).div(timeRange)); } diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol index 23f0e6e8702..c9726d9402b 100644 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ b/contracts/crowdsale/validation/TimedCrowdsale.sol @@ -11,8 +11,8 @@ import "../Crowdsale.sol"; contract TimedCrowdsale is Crowdsale { using SafeMath for uint256; - uint256 public openingTime; - uint256 public closingTime; + uint256 private openingTime_; + uint256 private closingTime_; /** * @dev Reverts if not in crowdsale time range. @@ -32,8 +32,22 @@ contract TimedCrowdsale is Crowdsale { require(_openingTime >= block.timestamp); require(_closingTime >= _openingTime); - openingTime = _openingTime; - closingTime = _closingTime; + openingTime_ = _openingTime; + closingTime_ = _closingTime; + } + + /** + * @return the crowdsale opening time. + */ + function openingTime() public view returns(uint256) { + return openingTime_; + } + + /** + * @return the crowdsale closing time. + */ + function closingTime() public view returns(uint256) { + return closingTime_; } /** @@ -41,7 +55,7 @@ contract TimedCrowdsale is Crowdsale { */ function isOpen() public view returns (bool) { // solium-disable-next-line security/no-block-members - return block.timestamp >= openingTime && block.timestamp <= closingTime; + return block.timestamp >= openingTime_ && block.timestamp <= closingTime_; } /** @@ -50,7 +64,7 @@ contract TimedCrowdsale is Crowdsale { */ function hasClosed() public view returns (bool) { // solium-disable-next-line security/no-block-members - return block.timestamp > closingTime; + return block.timestamp > closingTime_; } /**