Skip to content

Commit

Permalink
Non-constructor initialization removed (#1403)
Browse files Browse the repository at this point in the history
* signing prefix added

* Minor improvement

* Tests changed

* Successfully tested

* Minor improvements

* Minor improvements

* Revert "Dangling commas are now required. (#1359)"

This reverts commit a688977.

* updates

* fixes #1391

(cherry picked from commit da67e43)
  • Loading branch information
Aniket-Engg authored and come-maiz committed Oct 20, 2018
1 parent 7cd0d5a commit 3266de1
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
6 changes: 5 additions & 1 deletion contracts/crowdsale/distribution/FinalizableCrowdsale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ import "../validation/TimedCrowdsale.sol";
contract FinalizableCrowdsale is TimedCrowdsale {
using SafeMath for uint256;

bool private _finalized = false;
bool private _finalized;

event CrowdsaleFinalized();

constructor() public {
_finalized = false;
}

/**
* @return true if the crowdsale is finalized, false otherwise.
*/
Expand Down
6 changes: 5 additions & 1 deletion contracts/lifecycle/Pausable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ contract Pausable is PauserRole {
event Paused();
event Unpaused();

bool private _paused = false;
bool private _paused;

constructor() public {
_paused = false;
}

/**
* @return true if the contract is paused, false otherwise.
Expand Down
6 changes: 4 additions & 2 deletions contracts/payment/SplitPayment.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import "../math/SafeMath.sol";
contract SplitPayment {
using SafeMath for uint256;

uint256 private _totalShares = 0;
uint256 private _totalReleased = 0;
uint256 private _totalShares;
uint256 private _totalReleased;

mapping(address => uint256) private _shares;
mapping(address => uint256) private _released;
Expand All @@ -24,6 +24,8 @@ contract SplitPayment {
require(payees.length == shares.length);
require(payees.length > 0);

_totalShares = 0;
_totalReleased = 0;
for (uint256 i = 0; i < payees.length; i++) {
_addPayee(payees[i], shares[i]);
}
Expand Down
6 changes: 5 additions & 1 deletion contracts/utils/ReentrancyGuard.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ pragma solidity ^0.4.24;
contract ReentrancyGuard {

/// @dev counter to allow mutex lock with only one SSTORE operation
uint256 private _guardCounter = 1;
uint256 private _guardCounter;

constructor() public {
_guardCounter = 1;
}

/**
* @dev Prevents a contract from calling itself, directly or indirectly.
Expand Down

0 comments on commit 3266de1

Please sign in to comment.