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

Make ERC777 operator the caller (#2134)

Browse Source 
* Make the sender the operator

* Make hook methods private

* Add changelog entry
This commit is contained in:
Nicolás Venturo
2020-03-16 19:49:17 -03:00
committed by GitHub
parent 90058040f0
commit e7b22483af
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/token/ERC777/ERC777.behavior.js
View File

@ -281,7 +281,9 @@ function shouldBehaveLikeERC777InternalMint (recipient, operator, amount, data,
shouldInternalMintTokens(operator, recipient, amount, data, operatorData);
it('reverts when minting tokens for the zero address', async function () {
await expectRevert.unspecified(this.token.mintInternal(operator, ZERO_ADDRESS, amount, data, operatorData));
await expectRevert.unspecified(
this.token.mintInternal(ZERO_ADDRESS, amount, data, operatorData, { from: operator })
);
});
}
@ -290,7 +292,7 @@ function shouldInternalMintTokens (operator, to, amount, data, operatorData) {
const initialTotalSupply = await this.token.totalSupply();
const initialToBalance = await this.token.balanceOf(to);
const { logs } = await this.token.mintInternal(operator, to, amount, data, operatorData);
const { logs } = await this.token.mintInternal(to, amount, data, operatorData, { from: operator });
expectEvent.inLogs(logs, 'Minted', {
operator,
@ -332,7 +334,7 @@ function shouldBehaveLikeERC777SendBurnMintInternalWithReceiveHook (operator, am
it('mint (internal) reverts', async function () {
await expectRevert.unspecified(
this.token.mintInternal(operator, this.recipient, amount, data, operatorData)
this.token.mintInternal(this.recipient, amount, data, operatorData, { from: operator })
);
});
});
@ -387,7 +389,7 @@ function shouldBehaveLikeERC777SendBurnMintInternalWithReceiveHook (operator, am
it('TokensRecipient receives mint (internal) data and is called after state mutation', async function () {
const { tx } = await this.token.mintInternal(
operator, this.recipient, amount, data, operatorData,
this.recipient, amount, data, operatorData, { from: operator }
);
const postRecipientBalance = await this.token.balanceOf(this.recipient);

2
test/token/ERC777/ERC777.test.js
View File

@ -300,7 +300,7 @@ describe('ERC777', function () {
it('mint (internal) reverts', async function () {
await expectRevert(
this.token.mintInternal(operator, this.recipient, amount, data, operatorData),
this.token.mintInternal(this.recipient, amount, data, operatorData, { from: operator }),
'ERC777: token recipient contract has no implementer for ERC777TokensRecipient',
);
});