Browse Source

Remove grantTokens without vesting function

Jorge Izquierdo 8 years ago
parent
commit
f305382ef4
2 changed files with 2 additions and 6 deletions
  1. 1 5
      contracts/token/GrantableToken.sol
  2. 1 1
      test/GrantableToken.js

+ 1 - 5
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) {

+ 1 - 1
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);