fix test

test/utils/Context.ts

@@ -65,7 +65,8 @@ export class DODOContext {
   async init(config: DODOContextInitConfig) {
     this.EVM = new EVM
     this.Web3 = getDefaultWeb3()
-    this.DODOZoo = await contracts.newContract(contracts.DODO_ZOO_CONTRACT_NAME)
+    var cloneFactory = await contracts.newContract(contracts.CLONE_FACTORY_CONTRACT_NAME)
+
     this.BASE = await contracts.newContract(contracts.TEST_ERC20_CONTRACT_NAME, ["TestBase", 18])
     this.QUOTE = await contracts.newContract(contracts.TEST_ERC20_CONTRACT_NAME, ["TestQuote", 18])
     this.ORACLE = await contracts.newContract(contracts.NAIVE_ORACLE_CONTRACT_NAME)
@@ -76,8 +77,10 @@ export class DODOContext {
     this.Maintainer = allAccounts[2]
     this.spareAccounts = allAccounts.slice(3, 10)
 
+    var DODOTemplate = await contracts.newContract(contracts.DODO_CONTRACT_NAME)
+    this.DODOZoo = await contracts.newContract(contracts.DODO_ZOO_CONTRACT_NAME, [DODOTemplate.options.address, cloneFactory.options.address, this.Supervisor])
+
     await this.DODOZoo.methods.breedDODO(
-      this.Supervisor,
       this.Maintainer,
       this.BASE.options.address,
       this.QUOTE.options.address,
@@ -93,8 +96,6 @@ export class DODOContext {
     this.BaseCapital = contracts.getContractWithAddress(contracts.DODO_LP_TOKEN_CONTRACT_NAME, await this.DODO.methods._BASE_CAPITAL_TOKEN_().call())
     this.QuoteCapital = contracts.getContractWithAddress(contracts.DODO_LP_TOKEN_CONTRACT_NAME, await this.DODO.methods._QUOTE_CAPITAL_TOKEN_().call())
 
-    this.DODO.methods.claimOwnership().send(this.sendParam(this.Deployer))
-
     console.log(log.blueText("[Init dodo context]"))
   }
 

test/utils/Contracts.ts

@@ -10,6 +10,7 @@ if (process.env["COVERAGE"]) {
   jsonPath = "../../.coverage_artifacts/contracts/"
 }
 
+const CloneFactory = require(`${jsonPath}CloneFactory.json`)
 const DODO = require(`${jsonPath}DODO.json`)
 const DODOZoo = require(`${jsonPath}DODOZoo.json`)
 const DODOEthProxy = require(`${jsonPath}DODOEthProxy.json`)
@@ -17,10 +18,13 @@ const WETH = require(`${jsonPath}WETH9.json`)
 const TestERC20 = require(`${jsonPath}TestERC20.json`)
 const NaiveOracle = require(`${jsonPath}NaiveOracle.json`)
 const DODOLpToken = require(`${jsonPath}DODOLpToken.json`)
+const Uniswap = require(`${jsonPath}UniswapV2Pair.json`)
+const UniswapArbitrageur = require(`${jsonPath}UniswapArbitrageur.json`)
 
 import { getDefaultWeb3 } from './EVM';
 import { Contract } from 'web3-eth-contract';
 
+export const CLONE_FACTORY_CONTRACT_NAME = "CloneFactory"
 export const DODO_CONTRACT_NAME = "DODO"
 export const TEST_ERC20_CONTRACT_NAME = "TestERC20"
 export const NAIVE_ORACLE_CONTRACT_NAME = "NaiveOracle"
@@ -28,6 +32,20 @@ export const DODO_LP_TOKEN_CONTRACT_NAME = "DODOLpToken"
 export const DODO_ZOO_CONTRACT_NAME = "DOOZoo"
 export const DODO_ETH_PROXY_CONTRACT_NAME = "DODOEthProxy"
 export const WETH_CONTRACT_NAME = "WETH"
+export const UNISWAP_CONTRACT_NAME = "Uniswap"
+export const UNISWAP_ARBITRAGEUR_CONTRACT_NAME = "UniswapArbitrageur"
+
+var contractMap: { [name: string]: any } = {}
+contractMap[CLONE_FACTORY_CONTRACT_NAME] = CloneFactory
+contractMap[DODO_CONTRACT_NAME] = DODO
+contractMap[TEST_ERC20_CONTRACT_NAME] = TestERC20
+contractMap[NAIVE_ORACLE_CONTRACT_NAME] = NaiveOracle
+contractMap[DODO_LP_TOKEN_CONTRACT_NAME] = DODOLpToken
+contractMap[DODO_ZOO_CONTRACT_NAME] = DODOZoo
+contractMap[DODO_ETH_PROXY_CONTRACT_NAME] = DODOEthProxy
+contractMap[WETH_CONTRACT_NAME] = WETH
+contractMap[UNISWAP_CONTRACT_NAME] = Uniswap
+contractMap[UNISWAP_ARBITRAGEUR_CONTRACT_NAME] = UniswapArbitrageur
 
 interface ContractJson {
   abi: any;
@@ -36,51 +54,11 @@ interface ContractJson {
 }
 
 export function getContractJSON(contractName: string): ContractJson {
-  switch (contractName) {
-    case DODO_CONTRACT_NAME:
-      return {
-        abi: DODO.abi,
-        networks: DODO.networks,
-        byteCode: DODO.bytecode
-      };
-    case TEST_ERC20_CONTRACT_NAME:
-      return {
-        abi: TestERC20.abi,
-        networks: TestERC20.networks,
-        byteCode: TestERC20.bytecode
-      };
-    case NAIVE_ORACLE_CONTRACT_NAME:
-      return {
-        abi: NaiveOracle.abi,
-        networks: NaiveOracle.networks,
-        byteCode: NaiveOracle.bytecode
-      };
-    case DODO_LP_TOKEN_CONTRACT_NAME:
-      return {
-        abi: DODOLpToken.abi,
-        networks: DODOLpToken.networks,
-        byteCode: DODOLpToken.bytecode
-      };
-    case DODO_ZOO_CONTRACT_NAME:
-      return {
-        abi: DODOZoo.abi,
-        networks: DODOZoo.networks,
-        byteCode: DODOZoo.bytecode
-      };
-    case DODO_ETH_PROXY_CONTRACT_NAME:
-      return {
-        abi: DODOEthProxy.abi,
-        networks: DODOEthProxy.networks,
-        byteCode: DODOEthProxy.bytecode
-      };
-    case WETH_CONTRACT_NAME:
-      return {
-        abi: WETH.abi,
-        networks: WETH.networks,
-        byteCode: WETH.bytecode
-      };
-    default:
-      throw "CONTRACT_NAME_NOT_FOUND";
+  var info = contractMap[contractName]
+  return {
+    abi: info.abi,
+    networks: info.networks,
+    byteCode: info.bytecode
   }
 }