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

Transferrable is now transferrable

Browse Source
This commit is contained in:
Jorge Izquierdo
2017-02-10 14:59:19 +01:00
parent 8d9e12eda3
commit 93e7984c61
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/token/GrantableToken.sol
View File

@ -83,7 +83,7 @@ contract GrantableToken is StandardToken {
} }
} }
function transferrableTokens(address holder, uint64 time) constant public returns (uint256 nonVested) { function transferableTokens(address holder, uint64 time) constant public returns (uint256 nonVested) {
uint256 grantIndex = grants[holder].length; uint256 grantIndex = grants[holder].length;
for (uint256 i = 0; i < grantIndex; i++) { for (uint256 i = 0; i < grantIndex; i++) {
@ -94,7 +94,7 @@ contract GrantableToken is StandardToken {
} }
function transfer(address _to, uint _value) returns (bool success){ function transfer(address _to, uint _value) returns (bool success){
if (_value > transferrableTokens(msg.sender, uint64(now))) throw; if (_value > transferableTokens(msg.sender, uint64(now))) throw;
return super.transfer(_to, _value); return super.transfer(_to, _value);
} }

10
test/GrantableToken.js
View File

@ -19,7 +19,7 @@ contract('GrantableToken', function(accounts) {
await token.grantTokens(receiver, tokenAmount, { from: granter }) await token.grantTokens(receiver, tokenAmount, { from: granter })
assert.equal(await token.balanceOf(receiver), tokenAmount); assert.equal(await token.balanceOf(receiver), tokenAmount);
assert.equal(await token.transferrableTokens(receiver, +new Date()/1000), tokenAmount); assert.equal(await token.transferableTokens(receiver, +new Date()/1000), tokenAmount);
}) })
describe('getting a token grant', async () => { describe('getting a token grant', async () => {
@ -34,12 +34,12 @@ contract('GrantableToken', function(accounts) {
assert.equal(await token.balanceOf(receiver), tokenAmount); assert.equal(await token.balanceOf(receiver), tokenAmount);
}) })
it('has 0 transferrable tokens before cliff', async () => { it('has 0 transferable tokens before cliff', async () => {
assert.equal(await token.transferrableTokens(receiver, now), 0); assert.equal(await token.transferableTokens(receiver, now), 0);
}) })
it('all tokens are transferrable after vesting', async () => { it('all tokens are transferable after vesting', async () => {
assert.equal(await token.transferrableTokens(receiver, now + vesting + 1), tokenAmount); assert.equal(await token.transferableTokens(receiver, now + vesting + 1), tokenAmount);
}) })
it('throws when trying to transfer non vested tokens', async () => { it('throws when trying to transfer non vested tokens', async () => {