Commit fa49e518 by Leo Arias Committed by Francisco Giordano

Remove Minted and TokensBurned events (#1305)

* Remove the Minted event

* Remove the TokensBurned event

* Remove unused
parent 6c4c8989
...@@ -9,8 +9,6 @@ import "./ERC20.sol"; ...@@ -9,8 +9,6 @@ import "./ERC20.sol";
*/ */
contract ERC20Burnable is ERC20 { contract ERC20Burnable is ERC20 {
event TokensBurned(address indexed burner, uint256 value);
/** /**
* @dev Burns a specific amount of tokens. * @dev Burns a specific amount of tokens.
* @param value The amount of token to be burned. * @param value The amount of token to be burned.
...@@ -34,6 +32,5 @@ contract ERC20Burnable is ERC20 { ...@@ -34,6 +32,5 @@ contract ERC20Burnable is ERC20 {
*/ */
function _burn(address who, uint256 value) internal { function _burn(address who, uint256 value) internal {
super._burn(who, value); super._burn(who, value);
emit TokensBurned(who, value);
} }
} }
...@@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol"; ...@@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol";
* @dev ERC20 minting logic * @dev ERC20 minting logic
*/ */
contract ERC20Mintable is ERC20, MinterRole { contract ERC20Mintable is ERC20, MinterRole {
event Minted(address indexed to, uint256 amount);
event MintingFinished(); event MintingFinished();
bool private _mintingFinished = false; bool private _mintingFinished = false;
...@@ -42,7 +41,6 @@ contract ERC20Mintable is ERC20, MinterRole { ...@@ -42,7 +41,6 @@ contract ERC20Mintable is ERC20, MinterRole {
returns (bool) returns (bool)
{ {
_mint(to, amount); _mint(to, amount);
emit Minted(to, amount);
return true; return true;
} }
......
...@@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol"; ...@@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol";
* @dev ERC721 minting logic * @dev ERC721 minting logic
*/ */
contract ERC721Mintable is ERC721, MinterRole { contract ERC721Mintable is ERC721, MinterRole {
event Minted(address indexed to, uint256 tokenId);
event MintingFinished(); event MintingFinished();
bool private _mintingFinished = false; bool private _mintingFinished = false;
...@@ -42,7 +41,6 @@ contract ERC721Mintable is ERC721, MinterRole { ...@@ -42,7 +41,6 @@ contract ERC721Mintable is ERC721, MinterRole {
returns (bool) returns (bool)
{ {
_mint(to, tokenId); _mint(to, tokenId);
emit Minted(to, tokenId);
return true; return true;
} }
......
...@@ -28,12 +28,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) { ...@@ -28,12 +28,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
(await this.token.balanceOf(owner)).should.be.bignumber.equal(initialBalance - amount); (await this.token.balanceOf(owner)).should.be.bignumber.equal(initialBalance - amount);
}); });
it('emits a burn event', async function () {
const event = expectEvent.inLogs(this.logs, 'TokensBurned');
event.args.burner.should.equal(owner);
event.args.value.should.be.bignumber.equal(amount);
});
it('emits a transfer event', async function () { it('emits a transfer event', async function () {
const event = expectEvent.inLogs(this.logs, 'Transfer'); const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.equal(owner); event.args.from.should.equal(owner);
...@@ -79,12 +73,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) { ...@@ -79,12 +73,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
(await this.token.allowance(owner, burner)).should.be.bignumber.equal(originalAllowance - amount); (await this.token.allowance(owner, burner)).should.be.bignumber.equal(originalAllowance - amount);
}); });
it('emits a burn event', async function () {
const event = expectEvent.inLogs(this.logs, 'TokensBurned');
event.args.burner.should.equal(owner);
event.args.value.should.be.bignumber.equal(amount);
});
it('emits a transfer event', async function () { it('emits a transfer event', async function () {
const event = expectEvent.inLogs(this.logs, 'Transfer'); const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.equal(owner); event.args.from.should.equal(owner);
......
const { expectThrow } = require('../../helpers/expectThrow'); const { expectThrow } = require('../../helpers/expectThrow');
const expectEvent = require('../../helpers/expectEvent');
const BigNumber = web3.BigNumber; const BigNumber = web3.BigNumber;
...@@ -16,8 +15,8 @@ function shouldBehaveLikeERC20Capped (minter, [anyone], cap) { ...@@ -16,8 +15,8 @@ function shouldBehaveLikeERC20Capped (minter, [anyone], cap) {
}); });
it('should mint when amount is less than cap', async function () { it('should mint when amount is less than cap', async function () {
const { logs } = await this.token.mint(anyone, cap.sub(1), { from }); await this.token.mint(anyone, cap.sub(1), { from });
expectEvent.inLogs(logs, 'Minted'); (await this.token.totalSupply()).should.be.bignumber.equal(cap.sub(1));
}); });
it('should fail to mint if the ammount exceeds the cap', async function () { it('should fail to mint if the ammount exceeds the cap', async function () {
......
...@@ -104,11 +104,6 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) { ...@@ -104,11 +104,6 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
}); });
it('emits a mint and a transfer event', async function () { it('emits a mint and a transfer event', async function () {
const mintEvent = expectEvent.inLogs(this.logs, 'Minted', {
to: anyone,
});
mintEvent.args.amount.should.be.bignumber.equal(amount);
const transferEvent = expectEvent.inLogs(this.logs, 'Transfer', { const transferEvent = expectEvent.inLogs(this.logs, 'Transfer', {
from: ZERO_ADDRESS, from: ZERO_ADDRESS,
to: anyone, to: anyone,
......
...@@ -47,11 +47,6 @@ function shouldBehaveLikeMintAndBurnERC721 ( ...@@ -47,11 +47,6 @@ function shouldBehaveLikeMintAndBurnERC721 (
to: newOwner, to: newOwner,
}); });
logs[0].args.tokenId.should.be.bignumber.equal(thirdTokenId); logs[0].args.tokenId.should.be.bignumber.equal(thirdTokenId);
await expectEvent.inLogs(logs, 'Minted', {
to: newOwner,
});
logs[1].args.tokenId.should.be.bignumber.equal(thirdTokenId);
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment