fix swap test

This commit is contained in:
owen05
2020-12-01 11:32:47 +08:00
parent 21624daa07
commit b14eef1b80
8 changed files with 432 additions and 446 deletions

View File

@@ -10,7 +10,7 @@ import { SignHelper } from "../utils/SignHelper";
import BigNumber from "bignumber.js";
import { decimalStr, MAX_UINT256, mweiStr } from '../utils/Converter';
import { logGas } from '../utils/Log';
import { ProxyContext, getProxyContext } from '../utils/ProxyContext';
import { ProxyContext, getProxyContext } from '../utils/ProxyContextV2';
import { assert } from 'chai';
import * as contracts from '../utils/Contracts';
import { Contract } from 'web3-eth-contract';
@@ -76,7 +76,7 @@ async function init(ctx: ProxyContext): Promise<void> {
}
async function initCreateDVM(ctx: ProxyContext, token0: string, token1:string, token0Amount: string, token1Amount: string, ethValue:string,i:string): Promise<string> {
let PROXY = ctx.DODOProxy;
let PROXY = ctx.DODOProxyV2;
await PROXY.methods.createDODOVendingMachine(
project,
token0,
@@ -132,7 +132,7 @@ describe("DODOProxyV2.0", () => {
var quoteToken = ctx.USDT.options.address;
var baseAmount = decimalStr("10000");
var quoteAmount = mweiStr("10000");
await logGas(await ctx.DODOProxy.methods.createDODOVendingMachine(
await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
project,
baseToken,
quoteToken,
@@ -161,7 +161,7 @@ describe("DODOProxyV2.0", () => {
var quoteToken = ctx.USDT.options.address;
var baseAmount = decimalStr("5");
var quoteAmount = mweiStr("10000");
await logGas(await ctx.DODOProxy.methods.createDODOVendingMachine(
await logGas(await ctx.DODOProxyV2.methods.createDODOVendingMachine(
project,
baseToken,
quoteToken,
@@ -192,7 +192,7 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_baseReserve,decimalStr("100000"));
assert.equal(b_quoteReserve,mweiStr("30000"));
assert.equal(b_dlp,decimalStr("0"));
await logGas(await ctx.DODOProxy.methods.addDVMLiquidity(
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_DODO_USDT,
lp,
decimalStr("1000"),
@@ -218,7 +218,7 @@ describe("DODOProxyV2.0", () => {
assert.equal(b_baseReserve,decimalStr("5"));
assert.equal(b_quoteReserve,mweiStr("30000"));
assert.equal(b_dlp,decimalStr("0"));
await logGas(await ctx.DODOProxy.methods.addDVMLiquidity(
await logGas(await ctx.DODOProxyV2.methods.addDVMLiquidity(
dvm_WETH_USDT,
lp,
decimalStr("1"),
@@ -284,7 +284,7 @@ describe("DODOProxyV2.0", () => {
var directions = [
0
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2TokenToToken(
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.USDT.options.address,
@@ -315,7 +315,7 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2TokenToToken(
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToToken(
trader,
ctx.DODO.options.address,
ctx.WETH.options.address,
@@ -345,7 +345,7 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2ETHToToken(
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2ETHToToken(
trader,
ctx.DODO.options.address,
1,
@@ -376,7 +376,7 @@ describe("DODOProxyV2.0", () => {
0,
1
]
var tx = await logGas(await ctx.DODOProxy.methods.dodoSwapV2TokenToETH(
var tx = await logGas(await ctx.DODOProxyV2.methods.dodoSwapV2TokenToETH(
trader,
ctx.DODO.options.address,
decimalStr("10000"),