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

integrate withdraw base and quote to final settlement claim

Browse Source
This commit is contained in:
mingda
2020-09-17 23:50:56 +08:00
parent b4c1a5ba60
commit 4195a080bc
3 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/Admin.test.ts
View File

@@ -327,8 +327,6 @@ describe("Admin", () => {
.send(ctx.sendParam(ctx.Deployer));
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));
assert.equal(
await ctx.BASE.methods.balanceOf(lp1).call(),
@@ -357,16 +355,7 @@ describe("Admin", () => {
assert.equal(await ctx.DODO.methods._R_STATUS_().call(), "0");
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));
await ctx.DODO.methods.withdrawAllQuote().send(ctx.sendParam(lp1));
assert.equal(
await ctx.BASE.methods.balanceOf(lp1).call(),
decimalStr("94.995")
@@ -394,16 +383,7 @@ describe("Admin", () => {
assert.equal(await ctx.DODO.methods._R_STATUS_().call(), "0");
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));
await ctx.DODO.methods.withdrawAllQuote().send(ctx.sendParam(lp1));
assert.equal(
await ctx.BASE.methods.balanceOf(lp1).call(),
decimalStr("105")
@@ -434,9 +414,18 @@ describe("Admin", () => {
.send(ctx.sendParam(ctx.Deployer));
await assert.rejects(
ctx.DODO.methods.finalSettlement().send(ctx.sendParam(ctx.Deployer)),
/ DODO_CLOSED/
/DODO_CLOSED/
);
await assert.rejects(
ctx.DODO.methods.withdrawAllBase().send(ctx.sendParam(lp1)),
/DODO_CLOSED/
)
await assert.rejects(
ctx.DODO.methods.withdrawAllQuote().send(ctx.sendParam(lp1)),
/DODO_CLOSED/
)
await ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp2));
await assert.rejects(
ctx.DODO.methods.claimAssets().send(ctx.sendParam(lp2)),