From 0b71dcded2719050c2385890fa5675ba03c274de Mon Sep 17 00:00:00 2001 From: Jorge Izquierdo Date: Fri, 10 Feb 2017 16:20:23 +0100 Subject: [PATCH] Rename GrantableToken to VestedToken --- contracts/test-helpers/GrantableTokenMock.sol | 11 ----------- contracts/test-helpers/VestedTokenMock.sol | 11 +++++++++++ .../token/{GrantableToken.sol => VestedToken.sol} | 2 +- test/{GrantableToken.js => VestedToken.js} | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 contracts/test-helpers/GrantableTokenMock.sol create mode 100644 contracts/test-helpers/VestedTokenMock.sol rename contracts/token/{GrantableToken.sol => VestedToken.sol} (98%) rename test/{GrantableToken.js => VestedToken.js} (96%) diff --git a/contracts/test-helpers/GrantableTokenMock.sol b/contracts/test-helpers/GrantableTokenMock.sol deleted file mode 100644 index 74cadd1d1..000000000 --- a/contracts/test-helpers/GrantableTokenMock.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.4; - -import '../token/GrantableToken.sol'; - -// mock class using StandardToken -contract GrantableTokenMock is GrantableToken { - function GrantableTokenMock(address initialAccount, uint initialBalance) { - balances[initialAccount] = initialBalance; - totalSupply = initialBalance; - } -} diff --git a/contracts/test-helpers/VestedTokenMock.sol b/contracts/test-helpers/VestedTokenMock.sol new file mode 100644 index 000000000..01ff87dd9 --- /dev/null +++ b/contracts/test-helpers/VestedTokenMock.sol @@ -0,0 +1,11 @@ +pragma solidity ^0.4.4; + +import '../token/VestedToken.sol'; + +// mock class using StandardToken +contract VestedTokenMock is VestedToken { + function VestedTokenMock(address initialAccount, uint initialBalance) { + balances[initialAccount] = initialBalance; + totalSupply = initialBalance; + } +} diff --git a/contracts/token/GrantableToken.sol b/contracts/token/VestedToken.sol similarity index 98% rename from contracts/token/GrantableToken.sol rename to contracts/token/VestedToken.sol index cf5e955c6..20bea41b3 100644 --- a/contracts/token/GrantableToken.sol +++ b/contracts/token/VestedToken.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.8; import "./StandardToken.sol"; -contract GrantableToken is StandardToken { +contract VestedToken is StandardToken { struct TokenGrant { address granter; uint256 value; diff --git a/test/GrantableToken.js b/test/VestedToken.js similarity index 96% rename from test/GrantableToken.js rename to test/VestedToken.js index 45bcfc05a..fc72d0c2e 100644 --- a/test/GrantableToken.js +++ b/test/VestedToken.js @@ -1,7 +1,7 @@ const assertJump = require('./helpers/assertJump'); const timer = require('./helpers/timer'); -contract('GrantableToken', function(accounts) { +contract('VestedToken', function(accounts) { let token = null let now = 0 @@ -11,7 +11,7 @@ contract('GrantableToken', function(accounts) { const receiver = accounts[1] beforeEach(async () => { - token = await GrantableTokenMock.new(granter, 100); + token = await VestedTokenMock.new(granter, 100); now = +new Date()/1000; })