Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
93e7984c
Commit
93e7984c
authored
Feb 10, 2017
by
Jorge Izquierdo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transferrable is now transferrable
parent
8d9e12ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
GrantableToken.sol
contracts/token/GrantableToken.sol
+2
-2
GrantableToken.js
test/GrantableToken.js
+5
-5
No files found.
contracts/token/GrantableToken.sol
View file @
93e7984c
...
...
@@ -83,7 +83,7 @@ contract GrantableToken is StandardToken {
}
}
function transfer
r
ableTokens(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;
for (uint256 i = 0; i < grantIndex; i++) {
...
...
@@ -94,7 +94,7 @@ contract GrantableToken is StandardToken {
}
function transfer(address _to, uint _value) returns (bool success){
if (_value > transfer
r
ableTokens(msg.sender, uint64(now))) throw;
if (_value > transferableTokens(msg.sender, uint64(now))) throw;
return super.transfer(_to, _value);
}
...
...
test/GrantableToken.js
View file @
93e7984c
...
...
@@ -19,7 +19,7 @@ contract('GrantableToken', function(accounts) {
await
token
.
grantTokens
(
receiver
,
tokenAmount
,
{
from
:
granter
})
assert
.
equal
(
await
token
.
balanceOf
(
receiver
),
tokenAmount
);
assert
.
equal
(
await
token
.
transfer
r
ableTokens
(
receiver
,
+
new
Date
()
/
1000
),
tokenAmount
);
assert
.
equal
(
await
token
.
transferableTokens
(
receiver
,
+
new
Date
()
/
1000
),
tokenAmount
);
})
describe
(
'getting a token grant'
,
async
()
=>
{
...
...
@@ -34,12 +34,12 @@ contract('GrantableToken', function(accounts) {
assert
.
equal
(
await
token
.
balanceOf
(
receiver
),
tokenAmount
);
})
it
(
'has 0 transfer
r
able tokens before cliff'
,
async
()
=>
{
assert
.
equal
(
await
token
.
transfer
r
ableTokens
(
receiver
,
now
),
0
);
it
(
'has 0 transferable tokens before cliff'
,
async
()
=>
{
assert
.
equal
(
await
token
.
transferableTokens
(
receiver
,
now
),
0
);
})
it
(
'all tokens are transfer
r
able after vesting'
,
async
()
=>
{
assert
.
equal
(
await
token
.
transfer
r
ableTokens
(
receiver
,
now
+
vesting
+
1
),
tokenAmount
);
it
(
'all tokens are transferable after vesting'
,
async
()
=>
{
assert
.
equal
(
await
token
.
transferableTokens
(
receiver
,
now
+
vesting
+
1
),
tokenAmount
);
})
it
(
'throws when trying to transfer non vested tokens'
,
async
()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment