d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename claim to claimAssets

Browse Source
This commit is contained in:
mingda
2020-08-01 16:14:24 +08:00
parent 683f98c96c
commit 2b58bb1ac8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/impl/Settlement.sol
View File

@@ -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;
}

12
test/Admin.test.ts
View File

@@ -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/
)