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

* Made some inherit-only contracts internal.

* Added OwnableMock.
pull/1440/head
Nicolás Venturo 6 years ago committed by GitHub
parent df3c113711
commit 96d6103e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      contracts/access/roles/CapperRole.sol
  2. 2
      contracts/access/roles/MinterRole.sol
  3. 2
      contracts/access/roles/PauserRole.sol
  4. 2
      contracts/access/roles/SignerRole.sol
  5. 2
      contracts/drafts/SignatureBouncer.sol
  6. 2
      contracts/introspection/ERC165.sol
  7. 2
      contracts/lifecycle/Pausable.sol
  8. 6
      contracts/mocks/OwnableMock.sol
  9. 2
      contracts/ownership/Ownable.sol
  10. 2
      contracts/ownership/Secondary.sol
  11. 2
      contracts/payment/PullPayment.sol
  12. 2
      contracts/utils/ReentrancyGuard.sol
  13. 2
      test/ownership/Ownable.test.js

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

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

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

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

@ -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
*/

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

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

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

@ -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);
}

@ -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;
}

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

@ -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;

@ -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 () {

Loading…
Cancel
Save