From f305382ef44a92c3689934358b0bc98c17db5424 Mon Sep 17 00:00:00 2001 From: Jorge Izquierdo Date: Fri, 10 Feb 2017 16:18:36 +0100 Subject: [PATCH] Remove grantTokens without vesting function --- contracts/token/GrantableToken.sol | 6 +----- test/GrantableToken.js | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/contracts/token/GrantableToken.sol b/contracts/token/GrantableToken.sol index 79fc328e9..cf5e955c6 100644 --- a/contracts/token/GrantableToken.sol +++ b/contracts/token/GrantableToken.sol @@ -13,10 +13,6 @@ contract GrantableToken is StandardToken { mapping (address => TokenGrant[]) public grants; - function grantTokens(address _to, uint256 _value) { - transfer(_to, _value); - } - function grantVestedTokens(address _to, uint256 _value, uint64 _start, uint64 _cliff, uint64 _vesting) { if (_cliff < _start) throw; if (_vesting < _start) throw; @@ -25,7 +21,7 @@ contract GrantableToken is StandardToken { TokenGrant memory grant = TokenGrant({start: _start, value: _value, cliff: _cliff, vesting: _vesting, granter: msg.sender}); grants[_to].push(grant); - grantTokens(_to, _value); + transfer(_to, _value); } function revokeTokenGrant(address _holder, uint _grantId) { diff --git a/test/GrantableToken.js b/test/GrantableToken.js index 8f7ee4ac7..45bcfc05a 100644 --- a/test/GrantableToken.js +++ b/test/GrantableToken.js @@ -16,7 +16,7 @@ contract('GrantableToken', function(accounts) { }) it('granter can grant tokens without vesting', async () => { - await token.grantTokens(receiver, tokenAmount, { from: granter }) + await token.transfer(receiver, tokenAmount, { from: granter }) assert.equal(await token.balanceOf(receiver), tokenAmount); assert.equal(await token.transferableTokens(receiver, +new Date()/1000), tokenAmount);