From a2ce55f3367e3295f30a12c67cdac11fa84976c9 Mon Sep 17 00:00:00 2001
From: owen05 <liuhongnan53@163.com>
Date: Thu, 12 Nov 2020 11:38:36 +0800
Subject: [PATCH] fix

---
 .gitignore               |  1 +
 migrations/2_deploy.js   | 16 +++++++++++++---
 test/Route/Route.test.ts | 12 ------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f476ea..658570c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .idea
 
 build/
+build-v1/
 dist/
 node_modules/
 coverage/
diff --git a/migrations/2_deploy.js b/migrations/2_deploy.js
index c5949eb..b32ec7d 100644
--- a/migrations/2_deploy.js
+++ b/migrations/2_deploy.js
@@ -9,6 +9,13 @@ const DODOSellHelper = artifacts.require("DODOSellHelper");
 const DEPLOY_ROUTE = true;
 
 module.exports = async (deployer, network) => {
+  let DODOSellHelperAddress = ""
+  if(network == 'kovan'){
+    DODOSellHelperAddress = "0xbdEae617F2616b45DCB69B287D52940a76035Fe3";
+  }else {
+    DODOSellHelperAddress = "";
+  }
+
   logger.log("====================================================");
   logger.log("network type: " + network);
   logger.log("Deploy time: " + new Date().toLocaleString());
@@ -16,11 +23,14 @@ module.exports = async (deployer, network) => {
   if (DEPLOY_ROUTE) {
     logger.log("Deploy type: Smart Route");
     await deployer.deploy(SmartApprove);
-    await deployer.deploy(DODOSellHelper);
+    if(DODOSellHelperAddress == "") {
+      await deployer.deploy(DODOSellHelper);
+      DODOSellHelperAddress = DODOSellHelper.address;
+    }
     logger.log("SmartApprove Address: ",SmartApprove.address);
-    logger.log("DODOSellHelper Address: ",DODOSellHelper.address);
+    logger.log("DODOSellHelper Address: ",DODOSellHelperAddress);
 
-    await deployer.deploy(SmartSwap,SmartApprove.address,DODOSellHelper.address);
+    await deployer.deploy(SmartSwap,SmartApprove.address,DODOSellHelperAddress);
     logger.log("SmartSwap Address: ",SmartSwap.address);
 
     const SmartApproveInstance = await SmartApprove.deployed();
diff --git a/test/Route/Route.test.ts b/test/Route/Route.test.ts
index 08823c8..31f0e2b 100644
--- a/test/Route/Route.test.ts
+++ b/test/Route/Route.test.ts
@@ -155,9 +155,7 @@ describe("Trader", () => {
       var pairs = [{
         pair: ctx.DODO_USDT.options.address,
         base: ctx.DODO.options.address,
-        /*only for test*/
         pairContract: ctx.DODO_USDT
-        /**************/
       }];
 
       var tx = await logGas(await calcRoute(ctx,decimalStr('10'),0.1,routes,pairs), ctx.sendParam(trader), "directly swap")
@@ -193,15 +191,11 @@ describe("Trader", () => {
       var pairs = [{
         pair: ctx.DODO_USDT.options.address,
         base: ctx.DODO.options.address,
-        /*only for test*/
         pairContract: ctx.DODO_USDT
-        /**************/
       },{
         pair: ctx.USDT_USDC.options.address,
         base: ctx.USDT.options.address,
-        /*only for test*/
         pairContract: ctx.USDT_USDC
-        /**************/
       }];
 
       var tx = await logGas(await calcRoute(ctx,decimalStr('10'),0.1,routes,pairs), ctx.sendParam(trader), "tow hops swap")
@@ -240,21 +234,15 @@ describe("Trader", () => {
       var pairs = [{
         pair: ctx.DODO_USDT.options.address,
         base: ctx.DODO.options.address,
-        /*only for test*/
         pairContract: ctx.DODO_USDT
-        /**************/
       },{
         pair: ctx.USDT_USDC.options.address,
         base: ctx.USDT.options.address,
-        /*only for test*/
         pairContract: ctx.USDT_USDC
-        /**************/
       },{
         pair: ctx.WETH_USDC.options.address,
         base: ctx.WETH.options.address,
-        /*only for test*/
         pairContract: ctx.WETH_USDC
-        /**************/
       }];
 
       var tx = await logGas(await calcRoute(ctx,decimalStr('10'),0.1,routes,pairs), ctx.sendParam(trader), "three hops swap")