Merge branch 'rbac-migration' of github.com:OpenZeppelin/openzeppelin…

…-solidity into feat/mintable-erc721

contracts/mocks/ERC721MintableBurnableImpl.sol

@@ -9,8 +9,8 @@ import "../token/ERC721/ERC721Burnable.sol";
  * @title ERC721MintableBurnableImpl
  */
 contract ERC721MintableBurnableImpl is ERC721, ERC721Mintable, ERC721Burnable {
-  constructor(address[] _minters)
-    ERC721Mintable(_minters)
+  constructor()
+    ERC721Mintable()
     ERC721("Test", "TEST")
     public
   {

contracts/mocks/ERC721Mock.sol

@@ -11,8 +11,8 @@ import "../token/ERC721/ERC721Burnable.sol";
  * and a public setter for metadata URI
  */
 contract ERC721Mock is ERC721, ERC721Mintable, ERC721Burnable {
-  constructor(string _name, string _symbol, address[] _minters) public
-    ERC721Mintable(_minters)
+  constructor(string _name, string _symbol) public
+    ERC721Mintable()
     ERC721(_name, _symbol)
   {}
 

contracts/token/ERC20/ERC20Mintable.sol

@@ -50,8 +50,13 @@ contract ERC20Mintable is ERC20, MinterRole {
    * @dev Function to stop minting new tokens.
    * @return True if the operation was successful.
    */
-  function finishMinting() public onlyMinter canMint returns (bool) {
-    mintingFinished = true;
+  function finishMinting()
+    public
+    onlyMinter
+    onlyBeforeMintingFinished
+    returns (bool)
+  {
+    mintingFinished_ = true;
     emit MintingFinished();
     return true;
   }

contracts/token/ERC721/ERC721Mintable.sol

@@ -14,12 +14,6 @@ contract ERC721Mintable is ERC721, MinterRole {
 
   bool public mintingFinished = false;
 
-  constructor(address[] _minters)
-    MinterRole(_minters)
-    public
-  {
-  }
-
   modifier canMint() {
     require(!mintingFinished);
     _;

test/token/ERC721/ERC721.test.js

@@ -13,7 +13,6 @@ require('chai')
 
 contract('ERC721', function ([
   creator,
-  minter,
   ...accounts
 ]) {
   const name = 'Non Fungible Token';
@@ -23,6 +22,8 @@ contract('ERC721', function ([
   const thirdTokenId = 300;
   const nonExistentTokenId = 999;
 
+  const minter = creator;
+
   const [
     owner,
     newOwner,
@@ -31,7 +32,7 @@ contract('ERC721', function ([
   ] = accounts;
 
   beforeEach(async function () {
-    this.token = await ERC721.new(name, symbol, [minter], { from: creator });
+    this.token = await ERC721.new(name, symbol, { from: creator });
   });
 
   describe('like a full ERC721', function () {

test/token/ERC721/ERC721Burnable.test.js

@@ -10,9 +10,11 @@ require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-contract('ERC721Burnable', function ([_, creator, minter, ...accounts]) {
+contract('ERC721Burnable', function ([_, creator, ...accounts]) {
+  const minter = creator;
+
   beforeEach(async function () {
-    this.token = await ERC721Burnable.new([minter], { from: creator });
+    this.token = await ERC721Burnable.new({ from: creator });
   });
 
   shouldBehaveLikeERC721Basic(creator, minter, accounts);

test/token/ERC721/ERC721Mintable.test.js

@@ -10,9 +10,11 @@ require('chai')
   .use(require('chai-bignumber')(BigNumber))
   .should();
 
-contract('ERC721Mintable', function ([_, creator, minter, ...accounts]) {
+contract('ERC721Mintable', function ([_, creator, ...accounts]) {
+  const minter = creator;
+
   beforeEach(async function () {
-    this.token = await ERC721Mintable.new([minter], {
+    this.token = await ERC721Mintable.new({
       from: creator,
     });
   });

test/token/ERC721/ERC721Pausable.test.js

@@ -14,12 +14,22 @@ contract('ERC721Pausable', function ([
   creator,
   owner,
   operator,
+  otherPauser,
   ...accounts
 ]) {
   beforeEach(async function () {
     this.token = await ERC721Pausable.new({ from: creator });
   });
 
+  describe('pauser role', function () {
+    beforeEach(async function () {
+      this.contract = this.token;
+      await this.contract.addPauser(otherPauser, { from: creator });
+    });
+
+    shouldBehaveLikePublicRole(creator, otherPauser, accounts, 'pauser');
+  });
+
   context('when token is paused', function () {
     beforeEach(async function () {
       await this.token.pause({ from: creator });