diff --git a/contracts/examples/StandaloneERC20.sol b/contracts/examples/StandaloneERC20.sol index ae760c9f3..bbcf47262 100644 --- a/contracts/examples/StandaloneERC20.sol +++ b/contracts/examples/StandaloneERC20.sol @@ -11,7 +11,10 @@ import "../token/ERC20/ERC20Pausable.sol"; * */ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { - function initialize(string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder, address[] minters, address[] pausers) public initializer { + function initialize( + string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder, + address[] minters, address[] pausers + ) public initializer { require(initialSupply > 0); ERC20Detailed.initialize(name, symbol, decimals); @@ -37,7 +40,9 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa } } - function initialize(string name, string symbol, uint8 decimals, address[] minters, address[] pausers) public initializer { + function initialize( + string name, string symbol, uint8 decimals, address[] minters, address[] pausers + ) public initializer { ERC20Detailed.initialize(name, symbol, decimals); // Initialize the minter and pauser roles, and renounce them diff --git a/contracts/examples/StandaloneERC721.sol b/contracts/examples/StandaloneERC721.sol index 4640b3ed5..0090387d0 100644 --- a/contracts/examples/StandaloneERC721.sol +++ b/contracts/examples/StandaloneERC721.sol @@ -12,7 +12,9 @@ import "../token/ERC721/ERC721Pausable.sol"; * @title Standard ERC721 token, with minting and pause functionality. * */ -contract StandaloneERC721 is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable { +contract StandaloneERC721 + is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable +{ function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer { ERC721.initialize(); ERC721Enumerable.initialize(); diff --git a/contracts/examples/StandardToken.sol b/contracts/examples/StandardToken.sol index 1e54d6667..ff07ad145 100644 --- a/contracts/examples/StandardToken.sol +++ b/contracts/examples/StandardToken.sol @@ -11,7 +11,10 @@ import "../token/ERC20/ERC20Pausable.sol"; * */ contract StandardToken is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable { - function initialize(string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder, address[] minters, address[] pausers) public initializer { + function initialize( + string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder, + address[] minters, address[] pausers + ) public initializer { ERC20Detailed.initialize(name, symbol, decimals); // Mint the initial supply diff --git a/test/examples/StandaloneERC20.test.js b/test/examples/StandaloneERC20.test.js index bc803e723..7d186ca9b 100644 --- a/test/examples/StandaloneERC20.test.js +++ b/test/examples/StandaloneERC20.test.js @@ -4,15 +4,17 @@ const { assertRevert } = require('../helpers/assertRevert'); const BigNumber = web3.BigNumber; -const should = require('chai') +require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); const StandaloneERC20 = artifacts.require('StandaloneERC20'); -contract('StandaloneERC20', function ([_, deployer, initialHolder, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts]) { - const name = "StandaloneERC20"; - const symbol = "SAERC20"; +contract('StandaloneERC20', function ([ + _, deployer, initialHolder, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts +]) { + const name = 'StandaloneERC20'; + const symbol = 'SAERC20'; const decimals = 18; const initialSupply = 300; @@ -26,19 +28,25 @@ contract('StandaloneERC20', function ([_, deployer, initialHolder, minterA, mint this.token = await StandaloneERC20.new({ from: deployer }); }); - async function initializeFull(token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { - const callData = encodeCall('initialize', ['string', 'string', 'uint8', 'uint256', 'address', 'address[]', 'address[]'], [name, symbol, decimals, initialSupply, initialHolder, minters, pausers]); + async function initializeFull (token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { + const callData = encodeCall('initialize', + ['string', 'string', 'uint8', 'uint256', 'address', 'address[]', 'address[]'], + [name, symbol, decimals, initialSupply, initialHolder, minters, pausers]); await token.sendTransaction({ data: callData, from }); } - async function initializePartial(token, name, symbol, decimals, minters, pausers, from) { - const callData = encodeCall('initialize', ['string', 'string', 'uint8', 'address[]', 'address[]'], [name, symbol, decimals, minters, pausers]); + async function initializePartial (token, name, symbol, decimals, minters, pausers, from) { + const callData = encodeCall('initialize', + ['string', 'string', 'uint8', 'address[]', 'address[]'], + [name, symbol, decimals, minters, pausers]); await token.sendTransaction({ data: callData, from }); } describe('with all arguments', function () { it('reverts if initial balance is zero', async function () { - await assertRevert(initializeFull(this.token, name, symbol, decimals, 0, ZERO_ADDRESS, minters, pausers, deployer)); + await assertRevert( + initializeFull(this.token, name, symbol, decimals, 0, ZERO_ADDRESS, minters, pausers, deployer) + ); }); it('can be created with no minters', async function () { @@ -59,7 +67,9 @@ contract('StandaloneERC20', function ([_, deployer, initialHolder, minterA, mint context('with token', async function () { beforeEach(async function () { - await initializeFull(this.token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, deployer); + await initializeFull( + this.token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, deployer + ); }); it('initializes metadata', async function () { diff --git a/test/examples/StandaloneERC721.test.js b/test/examples/StandaloneERC721.test.js index 37d39f82c..ce301046d 100644 --- a/test/examples/StandaloneERC721.test.js +++ b/test/examples/StandaloneERC721.test.js @@ -1,17 +1,16 @@ const encodeCall = require('zos-lib/lib/helpers/encodeCall').default; -const { assertRevert } = require('../helpers/assertRevert'); const BigNumber = web3.BigNumber; -const should = require('chai') +require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); const StandaloneERC721 = artifacts.require('StandaloneERC721'); contract('StandaloneERC721', function ([_, deployer, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts]) { - const name = "StandaloneERC721"; - const symbol = "SAERC721"; + const name = 'StandaloneERC721'; + const symbol = 'SAERC721'; const minters = [minterA, minterB]; const pausers = [pauserA, pauserB]; @@ -20,8 +19,10 @@ contract('StandaloneERC721', function ([_, deployer, minterA, minterB, pauserA, this.token = await StandaloneERC721.new({ from: deployer }); }); - async function initialize(token, name, symbol, minters, pausers, from) { - const callData = encodeCall('initialize', ['string', 'string', 'address[]', 'address[]'], [name, symbol, minters, pausers]); + async function initialize (token, name, symbol, minters, pausers, from) { + const callData = encodeCall('initialize', + ['string', 'string', 'address[]', 'address[]'], + [name, symbol, minters, pausers]); await token.sendTransaction({ data: callData, from }); } diff --git a/test/examples/StandardToken.test.js b/test/examples/StandardToken.test.js index 811bb1a24..108821ea5 100644 --- a/test/examples/StandardToken.test.js +++ b/test/examples/StandardToken.test.js @@ -1,18 +1,19 @@ const encodeCall = require('zos-lib/lib/helpers/encodeCall').default; const { shouldBehaveLikeERC20Mintable } = require('../token/ERC20/behaviors/ERC20Mintable.behavior'); -const { shouldBehaveLikePublicRole } = require('../access/roles/PublicRole.behavior'); const BigNumber = web3.BigNumber; -const should = require('chai') +require('chai') .use(require('chai-bignumber')(BigNumber)) .should(); const StandardToken = artifacts.require('StandardToken'); -contract('StandardToken', function ([_, deployer, initialHolder, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts]) { - const name = "StdToken"; - const symbol = "STDT"; +contract('StandardToken', function ([ + _, deployer, initialHolder, minterA, minterB, pauserA, pauserB, anyone, ...otherAccounts +]) { + const name = 'StdToken'; + const symbol = 'STDT'; const decimals = 18; const initialSupply = 300; @@ -26,8 +27,10 @@ contract('StandardToken', function ([_, deployer, initialHolder, minterA, minter this.token = await StandardToken.new({ from: deployer }); }); - async function initialize(token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { - const callData = encodeCall('initialize', ['string', 'string', 'uint8', 'uint256', 'address', 'address[]', 'address[]'], [name, symbol, decimals, initialSupply, initialHolder, minters, pausers]); + async function initialize (token, name, symbol, decimals, initialSupply, initialHolder, minters, pausers, from) { + const callData = encodeCall('initialize', + ['string', 'string', 'uint8', 'uint256', 'address', 'address[]', 'address[]'], + [name, symbol, decimals, initialSupply, initialHolder, minters, pausers]); await token.sendTransaction({ data: callData, from }); }