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

Update all dependencies transitively (#2363)

Browse Source
This commit is contained in:
Francisco Giordano
2020-09-16 12:14:53 -03:00
committed by GitHub
parent bf4c9d700d
commit ace35fdeda
45 changed files with 6937 additions and 8793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
test/token/ERC1155/ERC1155.behavior.js
View File

@ -25,7 +25,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('reverts when queried about the zero address', async function () {
await expectRevert(
this.token.balanceOf(ZERO_ADDRESS, firstTokenId),
'ERC1155: balance query for the zero address'
'ERC1155: balance query for the zero address',
);
});
@ -33,17 +33,17 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('returns zero for given addresses', async function () {
expect(await this.token.balanceOf(
firstTokenHolder,
firstTokenId
firstTokenId,
)).to.be.bignumber.equal('0');
expect(await this.token.balanceOf(
secondTokenHolder,
secondTokenId
secondTokenId,
)).to.be.bignumber.equal('0');
expect(await this.token.balanceOf(
firstTokenHolder,
unknownTokenId
unknownTokenId,
)).to.be.bignumber.equal('0');
});
});
@ -60,24 +60,24 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{
from: minter,
}
},
);
});
it('returns the amount of tokens owned by the given addresses', async function () {
expect(await this.token.balanceOf(
firstTokenHolder,
firstTokenId
firstTokenId,
)).to.be.bignumber.equal(firstAmount);
expect(await this.token.balanceOf(
secondTokenHolder,
secondTokenId
secondTokenId,
)).to.be.bignumber.equal(secondAmount);
expect(await this.token.balanceOf(
firstTokenHolder,
unknownTokenId
unknownTokenId,
)).to.be.bignumber.equal('0');
});
});
@ -88,17 +88,17 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
await expectRevert(
this.token.balanceOfBatch(
[firstTokenHolder, secondTokenHolder, firstTokenHolder, secondTokenHolder],
[firstTokenId, secondTokenId, unknownTokenId]
[firstTokenId, secondTokenId, unknownTokenId],
),
'ERC1155: accounts and ids length mismatch'
'ERC1155: accounts and ids length mismatch',
);
await expectRevert(
this.token.balanceOfBatch(
[firstTokenHolder, secondTokenHolder],
[firstTokenId, secondTokenId, unknownTokenId]
[firstTokenId, secondTokenId, unknownTokenId],
),
'ERC1155: accounts and ids length mismatch'
'ERC1155: accounts and ids length mismatch',
);
});
@ -106,9 +106,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
await expectRevert(
this.token.balanceOfBatch(
[firstTokenHolder, secondTokenHolder, ZERO_ADDRESS],
[firstTokenId, secondTokenId, unknownTokenId]
[firstTokenId, secondTokenId, unknownTokenId],
),
'ERC1155: batch balance query for the zero address'
'ERC1155: batch balance query for the zero address',
);
});
@ -116,7 +116,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('returns zeros for each account', async function () {
const result = await this.token.balanceOfBatch(
[firstTokenHolder, secondTokenHolder, firstTokenHolder],
[firstTokenId, secondTokenId, unknownTokenId]
[firstTokenId, secondTokenId, unknownTokenId],
);
expect(result).to.be.an('array');
expect(result[0]).to.be.a.bignumber.equal('0');
@ -137,14 +137,14 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{
from: minter,
}
},
);
});
it('returns amounts owned by each account in order passed', async function () {
const result = await this.token.balanceOfBatch(
[secondTokenHolder, firstTokenHolder, firstTokenHolder],
[secondTokenId, firstTokenId, unknownTokenId]
[secondTokenId, firstTokenId, unknownTokenId],
);
expect(result).to.be.an('array');
expect(result[0]).to.be.a.bignumber.equal(secondAmount);
@ -155,7 +155,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('returns multiple times the balance of the same address when asked', async function () {
const result = await this.token.balanceOfBatch(
[firstTokenHolder, secondTokenHolder, firstTokenHolder],
[firstTokenId, secondTokenId, firstTokenId]
[firstTokenId, secondTokenId, firstTokenId],
);
expect(result).to.be.an('array');
expect(result[0]).to.be.a.bignumber.equal(result[2]);
@ -188,7 +188,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
it('reverts if attempting to approve self as an operator', async function () {
await expectRevert(
this.token.setApprovalForAll(multiTokenHolder, true, { from: multiTokenHolder }),
'ERC1155: setting approval status for self'
'ERC1155: setting approval status for self',
);
});
});
@ -205,7 +205,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{
from: minter,
}
},
);
});
@ -219,7 +219,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{ from: multiTokenHolder },
),
'ERC1155: insufficient balance for transfer'
'ERC1155: insufficient balance for transfer',
);
});
@ -233,7 +233,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{ from: multiTokenHolder },
),
'ERC1155: transfer to the zero address'
'ERC1155: transfer to the zero address',
);
});
@ -295,7 +295,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
this.token.safeTransferFrom(multiTokenHolder, recipient, firstTokenId, firstAmount, '0x', {
from: proxy,
}),
'ERC1155: caller is not owner nor approved'
'ERC1155: caller is not owner nor approved',
);
});
});
@ -344,7 +344,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
firstTokenId,
firstAmount,
'0x',
{ from: multiTokenHolder }
{ from: multiTokenHolder },
);
({ logs: this.transferLogs } = this.transferReceipt);
});
@ -377,7 +377,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
firstTokenId,
firstAmount,
data,
{ from: multiTokenHolder }
{ from: multiTokenHolder },
);
({ logs: this.transferLogs } = this.transferReceipt);
});
@ -414,7 +414,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
this.token.safeTransferFrom(multiTokenHolder, this.receiver.address, firstTokenId, firstAmount, '0x', {
from: multiTokenHolder,
}),
'ERC1155: ERC1155Receiver rejected tokens'
'ERC1155: ERC1155Receiver rejected tokens',
);
});
});
@ -432,7 +432,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
this.token.safeTransferFrom(multiTokenHolder, this.receiver.address, firstTokenId, firstAmount, '0x', {
from: multiTokenHolder,
}),
'ERC1155ReceiverMock: reverting on receive'
'ERC1155ReceiverMock: reverting on receive',
);
});
});
@ -443,7 +443,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
await expectRevert.unspecified(
this.token.safeTransferFrom(multiTokenHolder, invalidReceiver.address, firstTokenId, firstAmount, '0x', {
from: multiTokenHolder,
})
}),
);
});
});
@ -461,7 +461,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
'0x',
{
from: minter,
}
},
);
});
@ -471,9 +471,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, recipient,
[firstTokenId, secondTokenId],
[firstAmount, secondAmount.addn(1)],
'0x', { from: multiTokenHolder }
'0x', { from: multiTokenHolder },
),
'ERC1155: insufficient balance for transfer'
'ERC1155: insufficient balance for transfer',
);
});
@ -483,9 +483,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, recipient,
[firstTokenId],
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder }
'0x', { from: multiTokenHolder },
),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
await expectRevert(
@ -493,9 +493,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, recipient,
[firstTokenId, secondTokenId],
[firstAmount],
'0x', { from: multiTokenHolder }
'0x', { from: multiTokenHolder },
),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
});
@ -505,9 +505,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, ZERO_ADDRESS,
[firstTokenId, secondTokenId],
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder }
'0x', { from: multiTokenHolder },
),
'ERC1155: transfer to the zero address'
'ERC1155: transfer to the zero address',
);
});
@ -545,7 +545,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, recipient,
[firstTokenId, secondTokenId],
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder }
'0x', { from: multiTokenHolder },
));
});
@ -569,9 +569,9 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
multiTokenHolder, recipient,
[firstTokenId, secondTokenId],
[firstAmount, secondAmount],
'0x', { from: proxy }
'0x', { from: proxy },
),
'ERC1155: transfer caller is not owner nor approved'
'ERC1155: transfer caller is not owner nor approved',
);
});
});
@ -691,7 +691,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder },
),
'ERC1155: ERC1155Receiver rejected tokens'
'ERC1155: ERC1155Receiver rejected tokens',
);
});
});
@ -712,7 +712,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder },
),
'ERC1155ReceiverMock: reverting on batch receive'
'ERC1155ReceiverMock: reverting on batch receive',
);
});
});
@ -761,7 +761,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
[firstTokenId, secondTokenId],
[firstAmount, secondAmount],
'0x', { from: multiTokenHolder },
)
),
);
});
});

36
test/token/ERC1155/ERC1155.test.js
View File

@ -34,7 +34,7 @@ describe('ERC1155', function () {
it('reverts with a zero destination address', async function () {
await expectRevert(
this.token.mint(ZERO_ADDRESS, tokenId, mintAmount, data),
'ERC1155: mint to the zero address'
'ERC1155: mint to the zero address',
);
});
@ -63,19 +63,19 @@ describe('ERC1155', function () {
it('reverts with a zero destination address', async function () {
await expectRevert(
this.token.mintBatch(ZERO_ADDRESS, tokenBatchIds, mintAmounts, data),
'ERC1155: mint to the zero address'
'ERC1155: mint to the zero address',
);
});
it('reverts if length of inputs do not match', async function () {
await expectRevert(
this.token.mintBatch(tokenBatchHolder, tokenBatchIds, mintAmounts.slice(1), data),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
await expectRevert(
this.token.mintBatch(tokenBatchHolder, tokenBatchIds.slice(1), mintAmounts, data),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
});
@ -86,7 +86,7 @@ describe('ERC1155', function () {
tokenBatchIds,
mintAmounts,
data,
{ from: operator }
{ from: operator },
));
});
@ -101,7 +101,7 @@ describe('ERC1155', function () {
it('credits the minted batch of tokens', async function () {
const holderBatchBalances = await this.token.balanceOfBatch(
new Array(tokenBatchIds.length).fill(tokenBatchHolder),
tokenBatchIds
tokenBatchIds,
);
for (let i = 0; i < holderBatchBalances.length; i++) {
@ -115,14 +115,14 @@ describe('ERC1155', function () {
it('reverts when burning the zero account\'s tokens', async function () {
await expectRevert(
this.token.burn(ZERO_ADDRESS, tokenId, mintAmount),
'ERC1155: burn from the zero address'
'ERC1155: burn from the zero address',
);
});
it('reverts when burning a non-existent token id', async function () {
await expectRevert(
this.token.burn(tokenHolder, tokenId, mintAmount),
'ERC1155: burn amount exceeds balance'
'ERC1155: burn amount exceeds balance',
);
});
@ -132,12 +132,12 @@ describe('ERC1155', function () {
tokenId,
mintAmount,
data,
{ from: operator }
{ from: operator },
);
await expectRevert(
this.token.burn(tokenHolder, tokenId, mintAmount.addn(1)),
'ERC1155: burn amount exceeds balance'
'ERC1155: burn amount exceeds balance',
);
});
@ -148,7 +148,7 @@ describe('ERC1155', function () {
tokenHolder,
tokenId,
burnAmount,
{ from: operator }
{ from: operator },
));
});
@ -165,7 +165,7 @@ describe('ERC1155', function () {
it('accounts for both minting and burning', async function () {
expect(await this.token.balanceOf(
tokenHolder,
tokenId
tokenId,
)).to.be.bignumber.equal(mintAmount.sub(burnAmount));
});
});
@ -175,26 +175,26 @@ describe('ERC1155', function () {
it('reverts when burning the zero account\'s tokens', async function () {
await expectRevert(
this.token.burnBatch(ZERO_ADDRESS, tokenBatchIds, burnAmounts),
'ERC1155: burn from the zero address'
'ERC1155: burn from the zero address',
);
});
it('reverts if length of inputs do not match', async function () {
await expectRevert(
this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts.slice(1)),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
await expectRevert(
this.token.burnBatch(tokenBatchHolder, tokenBatchIds.slice(1), burnAmounts),
'ERC1155: ids and amounts length mismatch'
'ERC1155: ids and amounts length mismatch',
);
});
it('reverts when burning a non-existent token id', async function () {
await expectRevert(
this.token.burnBatch(tokenBatchHolder, tokenBatchIds, burnAmounts),
'ERC1155: burn amount exceeds balance'
'ERC1155: burn amount exceeds balance',
);
});
@ -205,7 +205,7 @@ describe('ERC1155', function () {
tokenBatchHolder,
tokenBatchIds,
burnAmounts,
{ from: operator }
{ from: operator },
));
});
@ -222,7 +222,7 @@ describe('ERC1155', function () {
it('accounts for both minting and burning', async function () {
const holderBatchBalances = await this.token.balanceOfBatch(
new Array(tokenBatchIds.length).fill(tokenBatchHolder),
tokenBatchIds
tokenBatchIds,
);
for (let i = 0; i < holderBatchBalances.length; i++) {

4
test/token/ERC1155/ERC1155Burnable.test.js
View File

@ -38,7 +38,7 @@ describe('ERC1155Burnable', function () {
it('unapproved accounts cannot burn the holder\'s tokens', async function () {
await expectRevert(
this.token.burn(holder, tokenIds[0], amounts[0].subn(1), { from: other }),
'ERC1155: caller is not owner nor approved'
'ERC1155: caller is not owner nor approved',
);
});
});
@ -62,7 +62,7 @@ describe('ERC1155Burnable', function () {
it('unapproved accounts cannot burn the holder\'s tokens', async function () {
await expectRevert(
this.token.burnBatch(holder, tokenIds, [ amounts[0].subn(1), amounts[1].subn(2) ], { from: other }),
'ERC1155: caller is not owner nor approved'
'ERC1155: caller is not owner nor approved',
);
});
});

18
test/token/ERC1155/ERC1155Pausable.test.js
View File

@ -32,58 +32,58 @@ describe('ERC1155Pausable', function () {
it('reverts when trying to safeTransferFrom from holder', async function () {
await expectRevert(
this.token.safeTransferFrom(holder, receiver, firstTokenId, firstTokenAmount, '0x', { from: holder }),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to safeTransferFrom from operator', async function () {
await expectRevert(
this.token.safeTransferFrom(holder, receiver, firstTokenId, firstTokenAmount, '0x', { from: operator }),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to safeBatchTransferFrom from holder', async function () {
await expectRevert(
this.token.safeBatchTransferFrom(holder, receiver, [firstTokenId], [firstTokenAmount], '0x', { from: holder }),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to safeBatchTransferFrom from operator', async function () {
await expectRevert(
this.token.safeBatchTransferFrom(
holder, receiver, [firstTokenId], [firstTokenAmount], '0x', { from: operator }
holder, receiver, [firstTokenId], [firstTokenAmount], '0x', { from: operator },
),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to mint', async function () {
await expectRevert(
this.token.mint(holder, secondTokenId, secondTokenAmount, '0x'),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to mintBatch', async function () {
await expectRevert(
this.token.mintBatch(holder, [secondTokenId], [secondTokenAmount], '0x'),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to burn', async function () {
await expectRevert(
this.token.burn(holder, firstTokenId, firstTokenAmount),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});
it('reverts when trying to burnBatch', async function () {
await expectRevert(
this.token.burn(holder, [firstTokenId], [firstTokenAmount]),
'ERC1155Pausable: token transfer while paused'
'ERC1155Pausable: token transfer while paused',
);
});