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

fix && addLiquidityToV1 && test

Browse Source
This commit is contained in:
owen05
2020-12-01 01:47:22 +08:00
parent c3f8e3cc40
commit 21624daa07
17 changed files with 419 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/Proxy/proxy.mix.test.ts
View File

@@ -5,13 +5,11 @@
*/
// import * as assert from 'assert';
import { decimalStr, mweiStr } from '../utils/Converter';
import { logGas } from '../utils/Log';
import { ProxyContext, getProxyContext } from '../utils/ProxyContext';
import { assert } from 'chai';
import * as contracts from '../utils/Contracts';
import { Contract } from 'web3-eth-contract';
let lp: string;
let project: string;
@@ -87,7 +85,10 @@ describe("DODOProxyV2.0", () => {
let dvm_WETH_USDT: string;
before(async () => {
ctx = await getProxyContext();
let ETH = await contracts.newContract(
contracts.WETH_CONTRACT_NAME
);
ctx = await getProxyContext(ETH.options.address);
await init(ctx);
dpp_DODO_USDT = await initCreateDPP(ctx, ctx.DODO.options.address, ctx.USDT.options.address, decimalStr("100000"), mweiStr("30000"), "0", mweiStr("0.3"));
dvm_WETH_USDT = await initCreateDVM(ctx, '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE', ctx.USDT.options.address, decimalStr("5"), mweiStr("30000"), "5", mweiStr("600"));
@@ -117,7 +118,7 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapTokenToToken(
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
@@ -147,10 +148,9 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapETHToToken(
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
decimalStr("1"),
1,
dodoPairs,
directions,
@@ -179,7 +179,7 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapTokenToETH(
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("10000"),