NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Mock suffix to variable names #1172 (#1324)

Browse Source 
* Add Mock suffix to variable names #1172

* Add Impl suffix to variable names

(cherry picked from commit 4b21fcf5af)
This commit is contained in:
Martín
2018-09-18 16:24:51 -03:00
committed by Leo Arias
parent a3bb56769e
commit 49d2dd9e08
18 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/token/ERC20/ERC20.test.js
View File

@ -2,7 +2,7 @@ const { assertRevert } = require('../../helpers/assertRevert');
const expectEvent = require('../../helpers/expectEvent');
const { ZERO_ADDRESS } = require('../../helpers/constants');
const ERC20 = artifacts.require('ERC20Mock');
const ERC20Mock = artifacts.require('ERC20Mock');
const BigNumber = web3.BigNumber;
@ -12,7 +12,7 @@ require('chai')
contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
beforeEach(async function () {
this.token = await ERC20.new(owner, 100);
this.token = await ERC20Mock.new(owner, 100);
});
describe('total supply', function () {

4
test/token/ERC20/ERC20Pausable.test.js
View File

@ -1,11 +1,11 @@
const { assertRevert } = require('../../helpers/assertRevert');
const ERC20Pausable = artifacts.require('ERC20PausableMock');
const ERC20PausableMock = artifacts.require('ERC20PausableMock');
const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior');
contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherAccount, ...otherAccounts]) {
beforeEach(async function () {
this.token = await ERC20Pausable.new(pauser, 100, { from: pauser });
this.token = await ERC20PausableMock.new(pauser, 100, { from: pauser });
});
describe('pauser role', function () {

12
test/token/ERC721/ERC721.behavior.js
View File

@ -4,7 +4,7 @@ const { ZERO_ADDRESS } = require('../../helpers/constants');
const { decodeLogs } = require('../../helpers/decodeLogs');
const { sendTransaction } = require('../../helpers/sendTransaction');
const ERC721Receiver = artifacts.require('ERC721ReceiverMock.sol');
const ERC721ReceiverMock = artifacts.require('ERC721ReceiverMock.sol');
const BigNumber = web3.BigNumber;
require('chai')
@ -237,7 +237,7 @@ function shouldBehaveLikeERC721 (
describe('to a valid receiver contract', function () {
beforeEach(async function () {
this.receiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, false);
this.receiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, false);
this.toWhom = this.receiver.address;
});
@ -246,7 +246,7 @@ function shouldBehaveLikeERC721 (
it('should call onERC721Received', async function () {
const result = await transferFun.call(this, owner, this.receiver.address, tokenId, { from: owner });
result.receipt.logs.length.should.be.equal(2);
const [log] = decodeLogs([result.receipt.logs[1]], ERC721Receiver, this.receiver.address);
const [log] = decodeLogs([result.receipt.logs[1]], ERC721ReceiverMock, this.receiver.address);
log.event.should.be.equal('Received');
log.args.operator.should.be.equal(owner);
log.args.from.should.be.equal(owner);
@ -261,7 +261,7 @@ function shouldBehaveLikeERC721 (
result.receipt.logs.length.should.be.equal(2);
const [log] = decodeLogs(
[result.receipt.logs[1]],
ERC721Receiver,
ERC721ReceiverMock,
this.receiver.address
);
log.event.should.be.equal('Received');
@ -297,14 +297,14 @@ function shouldBehaveLikeERC721 (
describe('to a receiver contract returning unexpected value', function () {
it('reverts', async function () {
const invalidReceiver = await ERC721Receiver.new('0x42', false);
const invalidReceiver = await ERC721ReceiverMock.new('0x42', false);
await assertRevert(this.token.safeTransferFrom(owner, invalidReceiver.address, tokenId, { from: owner }));
});
});
describe('to a receiver contract that throws', function () {
it('reverts', async function () {
const invalidReceiver = await ERC721Receiver.new(RECEIVER_MAGIC_VALUE, true);
const invalidReceiver = await ERC721ReceiverMock.new(RECEIVER_MAGIC_VALUE, true);
await assertRevert(this.token.safeTransferFrom(owner, invalidReceiver.address, tokenId, { from: owner }));
});
});

4
test/token/ERC721/ERC721.test.js
View File

@ -1,7 +1,7 @@
const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
const BigNumber = web3.BigNumber;
const ERC721 = artifacts.require('ERC721Mock.sol');
const ERC721Mock = artifacts.require('ERC721Mock.sol');
require('chai')
.use(require('chai-bignumber')(BigNumber))
@ -9,7 +9,7 @@ require('chai')
contract('ERC721', function ([_, creator, ...accounts]) {
beforeEach(async function () {
this.token = await ERC721.new({ from: creator });
this.token = await ERC721Mock.new({ from: creator });
});
shouldBehaveLikeERC721(creator, creator, accounts);

4
test/token/ERC721/ERC721Burnable.test.js
View File

@ -4,7 +4,7 @@ const {
} = require('./ERC721MintBurn.behavior');
const BigNumber = web3.BigNumber;
const ERC721Burnable = artifacts.require('ERC721MintableBurnableImpl.sol');
const ERC721BurnableImpl = artifacts.require('ERC721MintableBurnableImpl.sol');
require('chai')
.use(require('chai-bignumber')(BigNumber))
@ -14,7 +14,7 @@ contract('ERC721Burnable', function ([_, creator, ...accounts]) {
const minter = creator;
beforeEach(async function () {
this.token = await ERC721Burnable.new({ from: creator });
this.token = await ERC721BurnableImpl.new({ from: creator });
});
shouldBehaveLikeERC721(creator, minter, accounts);

4
test/token/ERC721/ERC721Mintable.test.js
View File

@ -4,7 +4,7 @@ const {
} = require('./ERC721MintBurn.behavior');
const BigNumber = web3.BigNumber;
const ERC721Mintable = artifacts.require('ERC721MintableBurnableImpl.sol');
const ERC721MintableImpl = artifacts.require('ERC721MintableBurnableImpl.sol');
require('chai')
.use(require('chai-bignumber')(BigNumber))
@ -14,7 +14,7 @@ contract('ERC721Mintable', function ([_, creator, ...accounts]) {
const minter = creator;
beforeEach(async function () {
this.token = await ERC721Mintable.new({
this.token = await ERC721MintableImpl.new({
from: creator,
});
});

4
test/token/ERC721/ERC721Pausable.test.js
View File

@ -3,7 +3,7 @@ const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
const { shouldBehaveLikePublicRole } = require('../../access/roles/PublicRole.behavior');
const BigNumber = web3.BigNumber;
const ERC721Pausable = artifacts.require('ERC721PausableMock.sol');
const ERC721PausableMock = artifacts.require('ERC721PausableMock.sol');
require('chai')
.use(require('chai-bignumber')(BigNumber))
@ -18,7 +18,7 @@ contract('ERC721Pausable', function ([
...accounts
]) {
beforeEach(async function () {
this.token = await ERC721Pausable.new({ from: creator });
this.token = await ERC721PausableMock.new({ from: creator });
});
describe('pauser role', function () {