From 2b58bb1ac800edea12aed7867c7426169aa22c85 Mon Sep 17 00:00:00 2001
From: mingda <leimingda@pku.edu.cn>
Date: Sat, 1 Aug 2020 16:14:24 +0800
Subject: [PATCH] rename claim to claimAssets

---
 contracts/impl/Settlement.sol |  6 +++---
 test/Admin.test.ts            | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contracts/impl/Settlement.sol b/contracts/impl/Settlement.sol
index bb133d1..087a627 100644
--- a/contracts/impl/Settlement.sol
+++ b/contracts/impl/Settlement.sol
@@ -29,7 +29,7 @@ contract Settlement is Storage {
 
     event Donate(uint256 amount, bool isBaseToken);
 
-    event Claim(address indexed user, uint256 baseTokenAmount, uint256 quoteTokenAmount);
+    event ClaimAssets(address indexed user, uint256 baseTokenAmount, uint256 quoteTokenAmount);
 
     // ============ Assets IN/OUT Functions ============
 
@@ -104,7 +104,7 @@ contract Settlement is Storage {
     }
 
     // claim remaining assets after final settlement
-    function claim() external preventReentrant {
+    function claimAssets() external preventReentrant {
         require(_CLOSED_, "DODO_NOT_CLOSED");
         require(!_CLAIMED_[msg.sender], "ALREADY_CLAIMED");
         _CLAIMED_[msg.sender] = true;
@@ -118,7 +118,7 @@ contract Settlement is Storage {
         );
         _baseTokenTransferOut(msg.sender, baseAmount);
         _quoteTokenTransferOut(msg.sender, quoteAmount);
-        emit Claim(msg.sender, baseAmount, quoteAmount);
+        emit ClaimAssets(msg.sender, baseAmount, quoteAmount);
         return;
     }
 
diff --git a/test/Admin.test.ts b/test/Admin.test.ts
index 0375223..3b95c64 100644
--- a/test/Admin.test.ts
+++ b/test/Admin.test.ts
@@ -182,7 +182,7 @@ describe("Admin", () => {
 
       await ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer))
 
-      await ctx.DODO.methods.claim().send(ctx.sendParam(lp1))
+      await ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp1))
       await ctx.DODO.methods.withdrawAllBase().send(ctx.sendParam(lp1))
       await ctx.DODO.methods.withdrawAllQuote().send(ctx.sendParam(lp1))
 
@@ -198,7 +198,7 @@ describe("Admin", () => {
       await ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer))
       assert.equal(await ctx.DODO.methods._R_STATUS_().call(), "0")
 
-      await ctx.DODO.methods.claim().send(ctx.sendParam(lp1))
+      await ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp1))
       assert.equal(await ctx.BASE.methods.balanceOf(lp1).call(), decimalStr("90"))
       assert.equal(await ctx.QUOTE.methods.balanceOf(lp1).call(), "9551951805416248746110")
       await ctx.DODO.methods.withdrawAllBase().send(ctx.sendParam(lp1))
@@ -215,7 +215,7 @@ describe("Admin", () => {
       await ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer))
       assert.equal(await ctx.DODO.methods._R_STATUS_().call(), "0")
 
-      await ctx.DODO.methods.claim().send(ctx.sendParam(lp1))
+      await ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp1))
       assert.equal(await ctx.BASE.methods.balanceOf(lp1).call(), decimalStr("95"))
       assert.equal(await ctx.QUOTE.methods.balanceOf(lp1).call(), decimalStr("9000"))
       await ctx.DODO.methods.withdrawAllBase().send(ctx.sendParam(lp1))
@@ -226,7 +226,7 @@ describe("Admin", () => {
 
     it("final settlement revert cases", async () => {
       await assert.rejects(
-        ctx.DODO.methods.claim().send(ctx.sendParam(lp1)),
+        ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp1)),
         /DODO_NOT_CLOSED/
       )
       await ctx.DODO.methods.depositBase(decimalStr("10")).send(ctx.sendParam(lp1))
@@ -239,9 +239,9 @@ describe("Admin", () => {
         / DODO_CLOSED/
       )
 
-      await ctx.DODO.methods.claim().send(ctx.sendParam(lp2))
+      await ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp2))
       await assert.rejects(
-        ctx.DODO.methods.claim().send(ctx.sendParam(lp2)),
+        ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp2)),
         /ALREADY_CLAIMED/
       )