update factory && kovan deploy

test/CrowdPooling/CPSettle.test.ts

@@ -10,7 +10,7 @@ import { logGas } from '../utils/Log';
 import { CPContext, CPContextInitConfig } from '../utils/CrowdPoolingContext';
 import BigNumber from 'bignumber.js';
 import { assert } from 'chai';
-import { DVM_NAME, getContractWithAddress, UNOWNED_DVM_FACTORY_NAME } from '../utils/Contracts';
+import { DVM_NAME, getContractWithAddress } from '../utils/Contracts';
 const truffleAssert = require('truffle-assertions');
 
 let bidder1: string;

test/CrowdPooling/CPSettleReversePool.test.ts

@@ -10,7 +10,7 @@ import { logGas } from '../utils/Log';
 import { CPContext, CPContextInitConfig } from '../utils/CrowdPoolingContext';
 import BigNumber from 'bignumber.js';
 // import { assert } from 'chai';
-import { DVM_NAME, getContractWithAddress, UNOWNED_DVM_FACTORY_NAME } from '../utils/Contracts';
+import { DVM_NAME, getContractWithAddress } from '../utils/Contracts';
 import { assert } from 'chai';
 const truffleAssert = require('truffle-assertions');
 

test/utils/Contracts.ts

@@ -31,7 +31,6 @@ export const DODO_MINE_READER_NAME = "DODOMineReader"
 export const DVM_VAULT_NAME = "DVMVault"
 export const DVM_NAME = "DVM"
 export const DVM_FACTORY_NAME = "DVMFactory"
-export const UNOWNED_DVM_FACTORY_NAME = "UnownedDVMFactory"
 export const DVM_PROXY_NAME = "DVMProxy"
 export const CONST_FEE_RATE_MODEL_NAME = "ConstFeeRateModel"
 export const PERMISSION_MANAGER_NAME = "PermissionManager"

test/utils/CrowdPoolingContext.ts

@@ -36,7 +36,7 @@ export interface CPContextInitConfig {
 export class CPContext {
   EVM: EVM;
   Web3: Web3;
-  UnownedDVMFactory: Contract;
+  DVMFactory: Contract;
   CP: Contract;
   BASE: Contract;
   QUOTE: Contract;
@@ -72,15 +72,17 @@ export class CPContext {
       ["TestQuote", "QUOTE", 18]
     );
 
-    this.UnownedDVMFactory = await contracts.newContract(contracts.UNOWNED_DVM_FACTORY_NAME,
+    this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
       [
         cloneFactory.options.address,
         dvmTemplate.options.address,
+        "0x0000000000000000000000000000000000000000",
         feeRateModel.options.address,
+        "0x0000000000000000000000000000000000000000",
+        defaultGasSource.options.address,
         this.Maintainer,
         feeRateModel.options.address,
-        permissionManager.options.address,
-        defaultGasSource.options.address
+        permissionManager.options.address
       ]
     )
 
@@ -95,7 +97,7 @@ export class CPContext {
         this.QUOTE.options.address,
         permissionManager.options.address,
         feeRateModel.options.address,
-        this.UnownedDVMFactory.options.address
+        this.DVMFactory.options.address
       ],
       [
         (await this.Web3.eth.getBlock(await this.Web3.eth.getBlockNumber())).timestamp,

test/utils/ProxyContextV2.ts

@@ -27,7 +27,6 @@ export class ProxyContext {
   DVMFactory: Contract;
   DPPFactory: Contract;
   CPFactory: Contract;
-  UnownedDVMFactory: Contract;
   DODOApprove: Contract;
   DODOCalleeHelper: Contract;
   DODOSellHelper: Contract;
@@ -74,21 +73,11 @@ export class ProxyContext {
         dvmAdminTemplate.options.address,
         feeRateModelTemplate.options.address,
         permissionManagerTemplate.options.address,
-        defaultGasSource.options.address
-       ]
-    )
-
-
-    this.UnownedDVMFactory = await contracts.newContract(contracts.UNOWNED_DVM_FACTORY_NAME,
-      [
-        cloneFactory.options.address,
-        dvmTemplate.options.address,
-        feeRateModelTemplate.options.address,
+        defaultGasSource.options.address,
         this.Deployer,
         feeRateModelTemplate.options.address,
-        permissionManagerTemplate.options.address,
-        defaultGasSource.options.address
-      ]
+        permissionManagerTemplate.options.address
+       ]
     )
 
     this.DODOApprove = await contracts.newContract(
@@ -113,7 +102,7 @@ export class ProxyContext {
       [
         cloneFactory.options.address,
         cpTemplate.options.address,
-        this.UnownedDVMFactory.options.address,
+        this.DVMFactory.options.address,
         feeRateModelTemplate.options.address,
         this.Deployer,
         feeRateModelTemplate.options.address,