add weth 2 eth support in crowdpooling

test/CrowdPooling/CPBid.test.ts

@@ -41,6 +41,7 @@ describe("Funding", () => {
       freezeDuration: new BigNumber(86400),
       vestingDuration: new BigNumber(86400),
       cliffRate: decimalStr("1"),
+      quoteTokenContract:""
     }
     ctx = new CPContext();
     await ctx.init(config);
@@ -57,7 +58,7 @@ describe("Funding", () => {
 
   describe("bid & cancel", () => {
 
-    it("bid", async () => {
+    it("bid and cancel", async () => {
       await ctx.QUOTE.methods.transfer(ctx.CP.options.address, decimalStr("100")).send(ctx.sendParam(bidder1))
       await logGas(ctx.CP.methods.bid(bidder1), ctx.sendParam(bidder1), "bid")
       assert.equal(await ctx.CP.methods.getShares(bidder1).call(), decimalStr("99.9"))
@@ -75,6 +76,7 @@ describe("Funding", () => {
       assert.equal(await ctx.CP.methods.getShares(bidder1).call(), decimalStr("79.9"))
       assert.equal(await ctx.CP.methods._TOTAL_SHARES_().call(), decimalStr("129.85"))
       assert.equal(await ctx.QUOTE.methods.balanceOf(bidder1).call(), decimalStr("920"))
+
     })
 
   })

test/utils/CrowdPoolingContext.ts

@@ -30,6 +30,7 @@ export interface CPContextInitConfig {
   freezeDuration: BigNumber;
   vestingDuration: BigNumber;
   cliffRate: string;
+  quoteTokenContract: string;
 }
 
 
@@ -43,6 +44,7 @@ export class CPContext {
   Deployer: string;
   Maintainer: string;
   SpareAccounts: string[];
+  DODOCallee: Contract;
 
   constructor() { }
 
@@ -67,10 +69,18 @@ export class CPContext {
       contracts.MINTABLE_ERC20_CONTRACT_NAME,
       ["TestBase", "BASE", 18]
     );
-    this.QUOTE = await contracts.newContract(
-      contracts.MINTABLE_ERC20_CONTRACT_NAME,
-      ["TestQuote", "QUOTE", 18]
-    );
+    if(config.quoteTokenContract){
+      this.QUOTE = await contracts.newContract(
+        config.quoteTokenContract,
+        ["TestQuote", "QUOTE", 18]
+      );
+    }else{
+      this.QUOTE = await contracts.newContract(
+        contracts.MINTABLE_ERC20_CONTRACT_NAME,
+        ["TestQuote", "QUOTE", 18]
+      );
+    }
+    this.DODOCallee = await contracts.newContract(contracts.DODO_CALLEE_HELPER_NAME,[this.QUOTE.options.address]);
 
     this.DVMFactory = await contracts.newContract(contracts.DVM_FACTORY_NAME,
       [

test/utils/EVM.ts

@@ -13,7 +13,7 @@ import Web3 from 'web3';
 export function getDefaultWeb3() {
   return new Web3(process.env.RPC_NODE_URI)
 }
-
+process.env.RPC_NODE_URI="http://127.0.0.1:8545"
 export class EVM {
   private provider = new Web3.providers.HttpProvider(process.env.RPC_NODE_URI);