Made some inherit-only contracts internal. (#1433)

* Made some inherit-only contracts internal.

* Added OwnableMock.
This commit is contained in:
Nicolás Venturo
2018-10-18 10:47:35 -03:00
committed by GitHub
parent df3c113711
commit 96d6103e0b
13 changed files with 19 additions and 11 deletions

View File

@ -10,7 +10,7 @@ contract CapperRole {
Roles.Role private cappers;
constructor() public {
constructor() internal {
_addCapper(msg.sender);
}

View File

@ -10,7 +10,7 @@ contract MinterRole {
Roles.Role private minters;
constructor() public {
constructor() internal {
_addMinter(msg.sender);
}

View File

@ -10,7 +10,7 @@ contract PauserRole {
Roles.Role private pausers;
constructor() public {
constructor() internal {
_addPauser(msg.sender);
}

View File

@ -10,7 +10,7 @@ contract SignerRole {
Roles.Role private signers;
constructor() public {
constructor() internal {
_addSigner(msg.sender);
}

View File

@ -36,6 +36,8 @@ contract SignatureBouncer is SignerRole {
// Signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
uint256 private constant _SIGNATURE_SIZE = 96;
constructor() internal {}
/**
* @dev requires that a valid signature of a signer was provided
*/

View File

@ -25,7 +25,7 @@ contract ERC165 is IERC165 {
* implement ERC165 itself
*/
constructor()
public
internal
{
_registerInterface(_InterfaceId_ERC165);
}

View File

@ -12,7 +12,7 @@ contract Pausable is PauserRole {
bool private _paused;
constructor() public {
constructor() internal {
_paused = false;
}

View File

@ -0,0 +1,6 @@
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";
contract OwnableMock is Ownable {
}

View File

@ -17,7 +17,7 @@ contract Ownable {
* @dev The Ownable constructor sets the original `owner` of the contract to the sender
* account.
*/
constructor() public {
constructor() internal {
_owner = msg.sender;
emit OwnershipTransferred(address(0), _owner);
}

View File

@ -10,7 +10,7 @@ contract Secondary {
/**
* @dev Sets the primary account to the one that is creating the Secondary contract.
*/
constructor() public {
constructor() internal {
_primary = msg.sender;
}

View File

@ -10,7 +10,7 @@ import "./escrow/Escrow.sol";
contract PullPayment {
Escrow private _escrow;
constructor() public {
constructor() internal {
_escrow = new Escrow();
}

View File

@ -11,7 +11,7 @@ contract ReentrancyGuard {
/// @dev counter to allow mutex lock with only one SSTORE operation
uint256 private _guardCounter;
constructor() public {
constructor() internal {
// The counter starts at one to prevent changing it from zero to a non-zero
// value, which is a more expensive operation.
_guardCounter = 1;

View File

@ -1,6 +1,6 @@
const { shouldBehaveLikeOwnable } = require('./Ownable.behavior');
const Ownable = artifacts.require('Ownable');
const Ownable = artifacts.require('OwnableMock');
contract('Ownable', function ([_, owner, ...otherAccounts]) {
beforeEach(async function () {