From 5e423bc353f853786eb8a25edda27e0cc0c1d368 Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Wed, 5 Jul 2017 11:24:59 -0300
Subject: [PATCH] add release function, deprecate claim

---
 contracts/token/TokenTimelock.sol | 10 +++++++++-
 test/TokenTimelock.js             | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/contracts/token/TokenTimelock.sol b/contracts/token/TokenTimelock.sol
index 595bf8d0b..7c85063c5 100644
--- a/contracts/token/TokenTimelock.sol
+++ b/contracts/token/TokenTimelock.sol
@@ -27,10 +27,18 @@ contract TokenTimelock {
   }
 
   /**
-   * @dev beneficiary claims tokens held by time lock
+   * @notice Transfers tokens held by timelock to beneficiary.
+   * Deprecated: please use TokenTimelock#release instead.
    */
   function claim() {
     require(msg.sender == beneficiary);
+    release();
+  }
+
+  /**
+   * @notice Transfers tokens held by timelock to beneficiary.
+   */
+  function release() {
     require(now >= releaseTime);
 
     uint amount = token.balanceOf(this);
diff --git a/test/TokenTimelock.js b/test/TokenTimelock.js
index 894ebae92..318cec98b 100644
--- a/test/TokenTimelock.js
+++ b/test/TokenTimelock.js
@@ -24,33 +24,33 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) {
     await this.token.mint(this.timelock.address, amount, {from: owner})
   })
 
-  it('cannot be claimed before time limit', async function () {
-    await this.timelock.claim({from: beneficiary}).should.be.rejected
+  it('cannot be released before time limit', async function () {
+    await this.timelock.release().should.be.rejected
   })
 
-  it('cannot be claimed just before time limit', async function () {
+  it('cannot be released just before time limit', async function () {
     await increaseTime(moment.duration(0.99, 'year'))
-    await this.timelock.claim({from: beneficiary}).should.be.rejected
+    await this.timelock.release().should.be.rejected
   })
 
-  it('can be claimed just after limit', async function () {
+  it('can be released just after limit', async function () {
     await increaseTime(moment.duration(1.01, 'year'))
-    await this.timelock.claim({from: beneficiary}).should.be.fulfilled
+    await this.timelock.release().should.be.fulfilled
     const balance = await this.token.balanceOf(beneficiary)
     balance.should.be.bignumber.equal(amount)
   })
 
-  it('can be claimed after time limit', async function () {
+  it('can be released after time limit', async function () {
     await increaseTime(moment.duration(2, 'year'))
-    await this.timelock.claim({from: beneficiary}).should.be.fulfilled
+    await this.timelock.release().should.be.fulfilled
     const balance = await this.token.balanceOf(beneficiary)
     balance.should.be.bignumber.equal(amount)
   })
 
-  it('cannot be claimed twice', async function () {
+  it('cannot be released twice', async function () {
     await increaseTime(moment.duration(2, 'year'))
-    await this.timelock.claim({from: beneficiary}).should.be.fulfilled
-    await this.timelock.claim({from: beneficiary}).should.be.rejected
+    await this.timelock.release().should.be.fulfilled
+    await this.timelock.release().should.be.rejected
     const balance = await this.token.balanceOf(beneficiary)
     balance.should.be.bignumber.equal(amount)
   })