From d645258f8c941c3266afda7c2755326d47a9cff2 Mon Sep 17 00:00:00 2001 From: owen05 Date: Fri, 22 Jan 2021 15:45:35 +0800 Subject: [PATCH] freeze --- test/V2Proxy/proxy.dpp.test.ts | 51 +++++++++++++++++----------------- test/V2Proxy/proxy.dvm.test.ts | 51 +++++++++++++++++----------------- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/test/V2Proxy/proxy.dpp.test.ts b/test/V2Proxy/proxy.dpp.test.ts index 4c16500..27671cb 100644 --- a/test/V2Proxy/proxy.dpp.test.ts +++ b/test/V2Proxy/proxy.dpp.test.ts @@ -131,31 +131,32 @@ describe("DODOProxyV2.0", () => { }); - // it("createDPP - ETH", async () => { - // var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'; - // var quoteToken = ctx.USDT.options.address; - // var baseAmount = decimalStr("5"); - // var quoteAmount = mweiStr("10000"); - // await logGas(await ctx.DODOProxyV2.methods.createDODOPrivatePool( - // baseToken, - // quoteToken, - // baseAmount, - // quoteAmount, - // config.lpFeeRate, - // config.i, - // config.k, - // Math.floor(new Date().getTime()/1000 + 60 * 10) - // ),ctx.sendParam(project, "5"),"createDPP - Wrap ETH"); - // var addrs = await ctx.DPPFactory.methods.getPrivatePool(ctx.WETH.options.address,quoteToken).call(); - // assert.equal( - // await ctx.WETH.methods.balanceOf(addrs[1]).call(), - // baseAmount - // ); - // assert.equal( - // await ctx.USDT.methods.balanceOf(addrs[1]).call(), - // quoteAmount - // ); - // }); + it("createDPP - ETH", async () => { + var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'; + var quoteToken = ctx.USDT.options.address; + var baseAmount = decimalStr("5"); + var quoteAmount = mweiStr("10000"); + await logGas(await ctx.DODOProxyV2.methods.createDODOPrivatePool( + baseToken, + quoteToken, + baseAmount, + quoteAmount, + config.lpFeeRate, + config.i, + config.k, + false, + Math.floor(new Date().getTime()/1000 + 60 * 10) + ),ctx.sendParam(project, "5"),"createDPP - Wrap ETH"); + var addrs = await ctx.DPPFactory.methods.getDODOPool(ctx.WETH.options.address,quoteToken).call(); + assert.equal( + await ctx.WETH.methods.balanceOf(addrs[1]).call(), + baseAmount + ); + assert.equal( + await ctx.USDT.methods.balanceOf(addrs[1]).call(), + quoteAmount + ); + }); it("resetDPP", async () => { var beforeState = await DPP_DODO_USDT.methods.getPMMState().call(); diff --git a/test/V2Proxy/proxy.dvm.test.ts b/test/V2Proxy/proxy.dvm.test.ts index 8cf4ab4..263c11d 100644 --- a/test/V2Proxy/proxy.dvm.test.ts +++ b/test/V2Proxy/proxy.dvm.test.ts @@ -132,31 +132,32 @@ describe("DODOProxyV2.0", () => { }); - // it("createDVM - ETH", async () => { - // var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'; - // var quoteToken = ctx.USDT.options.address; - // var baseAmount = decimalStr("5"); - // var quoteAmount = mweiStr("10000"); - // await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine( - // baseToken, - // quoteToken, - // baseAmount, - // quoteAmount, - // config.lpFeeRate, - // config.i, - // config.k, - // Math.floor(new Date().getTime() / 1000 + 60 * 10) - // ), ctx.sendParam(project, '5'), "createDVM - Wrap ETH"); - // var addrs = await ctx.DVMFactory.methods.getDODOPool(ctx.WETH.options.address, quoteToken).call(); - // assert.equal( - // await ctx.WETH.methods.balanceOf(addrs[1]).call(), - // baseAmount - // ); - // assert.equal( - // await ctx.USDT.methods.balanceOf(addrs[1]).call(), - // quoteAmount - // ); - // }); + it("createDVM - ETH", async () => { + var baseToken = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'; + var quoteToken = ctx.USDT.options.address; + var baseAmount = decimalStr("5"); + var quoteAmount = mweiStr("10000"); + await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine( + baseToken, + quoteToken, + baseAmount, + quoteAmount, + config.lpFeeRate, + config.i, + config.k, + false, + Math.floor(new Date().getTime() / 1000 + 60 * 10) + ), ctx.sendParam(project, '5'), "createDVM - Wrap ETH"); + var addrs = await ctx.DVMFactory.methods.getDODOPool(ctx.WETH.options.address, quoteToken).call(); + assert.equal( + await ctx.WETH.methods.balanceOf(addrs[1]).call(), + baseAmount + ); + assert.equal( + await ctx.USDT.methods.balanceOf(addrs[1]).call(), + quoteAmount + ); + }); it("addLiquidity", async () => {