Skip to content

Fix decrease allowance and add non-zero address precondition to approve #1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 8 commits into from
Sep 7, 2018
Merged

Fix decrease allowance and add non-zero address precondition to approve #1293

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f306cc8
rename {increase,decrease}Approval to {increase,decrease}Allowance
frangio Sep 6, 2018
2470b65
add non-zero spender check to approve and {increase,decrease}Allowance
frangio Sep 6, 2018
79fb00c
Updated tests to reflect the new behavior.
nventuro Sep 7, 2018
00f124e
fix wrong test description
frangio Sep 7, 2018
267c384
fix old function names
frangio Sep 7, 2018
f7d18fe
Fixed linter error.
nventuro Sep 7, 2018
5d87d9a
Merge branch 'master' into fix-increase-decrease-allowance
frangio Sep 7, 2018
f98cdfa
Fixed typo.
nventuro Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into fix-increase-decrease-allowance
  • Loading branch information
@frangio
frangio authored Sep 7, 2018
commit 5d87d9a6fb19e421f5ee4b77ee3018e3999c2264
12 changes: 6 additions & 6 deletions test/token/ERC20/ERC20Pausable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherA
});

it('allows to decrease approval when unpaused', async function () {
await this.token.decreaseAllowance(anotherAccount, 40, { from: owner });
await this.token.decreaseAllowance(anotherAccount, 40, { from: pauser });

(await this.token.allowance(pauser, anotherAccount)).should.be.bignumber.equal(60);
});
Expand All @@ -205,15 +205,15 @@ contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherA
await this.token.pause({ from: pauser });
await this.token.unpause({ from: pauser });

await this.token.decreaseAllowance(anotherAccount, 40, { from: owner });
await this.token.decreaseAllowance(anotherAccount, 40, { from: pauser });

(await this.token.allowance(pauser, anotherAccount)).should.be.bignumber.equal(60);
});

it('reverts when trying to transfer when paused', async function () {
await this.token.pause({ from: pauser });

await assertRevert(this.token.decreaseAllowance(anotherAccount, 40, { from: owner }));
await assertRevert(this.token.decreaseAllowance(anotherAccount, 40, { from: pauser }));
});
});

Expand All @@ -223,7 +223,7 @@ contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherA
});

it('allows to increase approval when unpaused', async function () {
await this.token.increaseAllowance(anotherAccount, 40, { from: owner });
await this.token.increaseAllowannce(anotherAccount, 40, { from: pauser });

(await this.token.allowance(pauser, anotherAccount)).should.be.bignumber.equal(140);
});
Expand All @@ -232,15 +232,15 @@ contract('ERC20Pausable', function ([_, pauser, otherPauser, recipient, anotherA
await this.token.pause({ from: pauser });
await this.token.unpause({ from: pauser });

await this.token.increaseAllowance(anotherAccount, 40, { from: owner });
await this.token.increaseAllowance(anotherAccount, 40, { from: pauser });

(await this.token.allowance(pauser, anotherAccount)).should.be.bignumber.equal(140);
});

it('reverts when trying to increase approval when paused', async function () {
await this.token.pause({ from: pauser });

await assertRevert(this.token.increaseAllowance(anotherAccount, 40, { from: owner }));
await assertRevert(this.token.increaseAllowance(anotherAccount, 40, { from: pauser }));
});
});
});
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.