From 61e33197b2cdf7d86455ddd98a38b6a26002b8ea Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 3 Apr 2017 22:04:07 -0300 Subject: [PATCH] rename TransferableToken to LimitedTransferToken fixes #179 --- .../{TransferableToken.sol => LimitedTransferToken.sol} | 6 +++--- contracts/token/VestedToken.sol | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename contracts/token/{TransferableToken.sol => LimitedTransferToken.sol} (89%) diff --git a/contracts/token/TransferableToken.sol b/contracts/token/LimitedTransferToken.sol similarity index 89% rename from contracts/token/TransferableToken.sol rename to contracts/token/LimitedTransferToken.sol index e7df65194..2bfe873d0 100644 --- a/contracts/token/TransferableToken.sol +++ b/contracts/token/LimitedTransferToken.sol @@ -4,7 +4,7 @@ import "./ERC20.sol"; /* -TransferableToken defines the generic interface and the implementation +LimitedTransferToken defines the generic interface and the implementation to limit token transferability for different events. It is intended to be used as a base class for other token contracts. @@ -12,7 +12,7 @@ It is intended to be used as a base class for other token contracts. Over-writting transferableTokens(address holder, uint64 time) is the way to provide the specific logic for limitting token transferability for a holder over time. -TransferableToken has been designed to allow for different limitting factors, +LimitedTransferToken has been designed to allow for different limitting factors, this can be achieved by recursively calling super.transferableTokens() until the base class is hit. For example: @@ -25,7 +25,7 @@ https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/contracts/token/Ve */ -contract TransferableToken is ERC20 { +contract LimitedTransferToken is ERC20 { // Checks whether it can transfer or otherwise throws. modifier canTransfer(address _sender, uint _value) { if (_value > transferableTokens(_sender, uint64(now))) throw; diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol index 9eb822672..da350584b 100644 --- a/contracts/token/VestedToken.sol +++ b/contracts/token/VestedToken.sol @@ -2,9 +2,9 @@ pragma solidity ^0.4.8; import "./StandardToken.sol"; -import "./TransferableToken.sol"; +import "./LimitedTransferToken.sol"; -contract VestedToken is StandardToken, TransferableToken { +contract VestedToken is StandardToken, LimitedTransferToken { struct TokenGrant { address granter; uint256 value;