Remove Minted and TokensBurned events (#1305)

* Remove the Minted event

* Remove the TokensBurned event

* Remove unused
pull/1304/head^2
Leo Arias 7 years ago committed by Francisco Giordano
parent 6c4c8989b3
commit fa49e5189d
  1. 3
      contracts/token/ERC20/ERC20Burnable.sol
  2. 2
      contracts/token/ERC20/ERC20Mintable.sol
  3. 2
      contracts/token/ERC721/ERC721Mintable.sol
  4. 12
      test/token/ERC20/ERC20Burnable.behavior.js
  5. 5
      test/token/ERC20/ERC20Capped.behavior.js
  6. 5
      test/token/ERC20/ERC20Mintable.behavior.js
  7. 5
      test/token/ERC721/ERC721MintBurn.behavior.js

@ -9,8 +9,6 @@ import "./ERC20.sol";
*/
contract ERC20Burnable is ERC20 {
event TokensBurned(address indexed burner, uint256 value);
/**
* @dev Burns a specific amount of tokens.
* @param value The amount of token to be burned.
@ -34,6 +32,5 @@ contract ERC20Burnable is ERC20 {
*/
function _burn(address who, uint256 value) internal {
super._burn(who, value);
emit TokensBurned(who, value);
}
}

@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol";
* @dev ERC20 minting logic
*/
contract ERC20Mintable is ERC20, MinterRole {
event Minted(address indexed to, uint256 amount);
event MintingFinished();
bool private _mintingFinished = false;
@ -42,7 +41,6 @@ contract ERC20Mintable is ERC20, MinterRole {
returns (bool)
{
_mint(to, amount);
emit Minted(to, amount);
return true;
}

@ -9,7 +9,6 @@ import "../../access/roles/MinterRole.sol";
* @dev ERC721 minting logic
*/
contract ERC721Mintable is ERC721, MinterRole {
event Minted(address indexed to, uint256 tokenId);
event MintingFinished();
bool private _mintingFinished = false;
@ -42,7 +41,6 @@ contract ERC721Mintable is ERC721, MinterRole {
returns (bool)
{
_mint(to, tokenId);
emit Minted(to, tokenId);
return true;
}

@ -28,12 +28,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
(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 () {
const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.equal(owner);
@ -79,12 +73,6 @@ function shouldBehaveLikeERC20Burnable (owner, initialBalance, [burner]) {
(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 () {
const event = expectEvent.inLogs(this.logs, 'Transfer');
event.args.from.should.equal(owner);

@ -1,5 +1,4 @@
const { expectThrow } = require('../../helpers/expectThrow');
const expectEvent = require('../../helpers/expectEvent');
const BigNumber = web3.BigNumber;
@ -16,8 +15,8 @@ function shouldBehaveLikeERC20Capped (minter, [anyone], cap) {
});
it('should mint when amount is less than cap', async function () {
const { logs } = await this.token.mint(anyone, cap.sub(1), { from });
expectEvent.inLogs(logs, 'Minted');
await this.token.mint(anyone, cap.sub(1), { from });
(await this.token.totalSupply()).should.be.bignumber.equal(cap.sub(1));
});
it('should fail to mint if the ammount exceeds the cap', async function () {

@ -104,11 +104,6 @@ function shouldBehaveLikeERC20Mintable (minter, [anyone]) {
});
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', {
from: ZERO_ADDRESS,
to: anyone,

@ -47,11 +47,6 @@ function shouldBehaveLikeMintAndBurnERC721 (
to: newOwner,
});
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);
});
});

Loading…
Cancel
Save