d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/V2' of https://github.com/DODOEX/contractV2 into feature/V2

Browse Source
This commit is contained in:
牛涛涛
2021-01-21 17:49:17 +08:00
parent f3efadaf20 05c9a0f750
commit 4caee12c0e
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/DVM/FeeRateModelUpdate.test.ts
View File

@@ -66,23 +66,23 @@ describe("FeeratemodelUpdate", () => {
"3000000000000000" "3000000000000000"
); );
console.log('~~~~~~~~~~~~~~~~~start update feerateModel~~~~~~~~~~~~~~~~~') console.log('~~~~~~~~~~~~~~~~~start update feerateModel~~~~~~~~~~~~~~~~~')
//no updatefile.sol found
var feerateLogicUpdateAddress = ctx.MtFeeRateModelLogicUpdate.options.address; // var feerateLogicUpdateAddress = ctx.MtFeeRateModelLogicUpdate.options.address;
await ctx.mtFeeRateModel.methods.setFeeRate(decimalStr("0.001"),feerateLogicUpdateAddress).send(ctx.sendParam(ctx.Deployer)) // await ctx.mtFeeRateModel.methods.setFeeRate(decimalStr("0.001"),feerateLogicUpdateAddress).send(ctx.sendParam(ctx.Deployer))
var feeRateUpdate = await ctx.DVM.methods.getUserFeeRate(lp).call() // var feeRateUpdate = await ctx.DVM.methods.getUserFeeRate(lp).call()
console.log(feeRateUpdate[1]) // console.log(feeRateUpdate[1])
assert.equal( // assert.equal(
feeRateUpdate[1], // feeRateUpdate[1],
"4000000000000000" // "4000000000000000"
); // );
console.log('~~~~~~~~~~~~~~~~~set feeMapping[trader] ==0 ~~~~~~~~~~~~~~~~~') // console.log('~~~~~~~~~~~~~~~~~set feeMapping[trader] ==0 ~~~~~~~~~~~~~~~~~')
await ctx.mtFeeRateModel.methods.setSpecificFeeRate(trader,decimalStr("0.001"),feerateLogicUpdateAddress).send(ctx.sendParam(ctx.Deployer)) // await ctx.mtFeeRateModel.methods.setSpecificFeeRate(trader,decimalStr("0.001"),feerateLogicUpdateAddress).send(ctx.sendParam(ctx.Deployer))
var feeRateTrader = await ctx.DVM.methods.getUserFeeRate(trader).call() // var feeRateTrader = await ctx.DVM.methods.getUserFeeRate(trader).call()
console.log(feeRateTrader[1]) // console.log(feeRateTrader[1])
assert.equal(// if(feeMapping[trader] == 0) return _FEE_RATE_; // assert.equal(// if(feeMapping[trader] == 0) return _FEE_RATE_;
feeRateUpdate[1], // feeRateUpdate[1],
"4000000000000000" // "4000000000000000"
); // );
}) })

5
test/utils/DVMContext.ts
View File

@@ -60,7 +60,6 @@ export class DVMContext {
mtFeeRateModel: Contract; mtFeeRateModel: Contract;
MtFeeRateModelLogic: Contract; MtFeeRateModelLogic: Contract;
MtFeeRateModelLogicUpdate: Contract;
constructor() { } constructor() { }
@@ -101,7 +100,8 @@ export class DVMContext {
// permissionManager.options.address, // permissionManager.options.address,
// gasPriceSource.options.address, // gasPriceSource.options.address,
config.i, config.i,
config.k config.k,
true
).send(this.sendParam(this.Deployer)) ).send(this.sendParam(this.Deployer))
await gasPriceSource.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer)) await gasPriceSource.methods.initOwner(this.Deployer).send(this.sendParam(this.Deployer))
@@ -111,7 +111,6 @@ export class DVMContext {
this.MtFeeRateModelLogic = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_NAME) this.MtFeeRateModelLogic = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_NAME)
this.MtFeeRateModelLogicUpdate = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_UPDATE_NAME)
console.log(log.blueText("[Init DVM context]")); console.log(log.blueText("[Init DVM context]"));
} }

2
test/utils/ProxyContextV2.ts
View File

@@ -41,7 +41,6 @@ export class ProxyContext {
DODOIncentive: Contract; DODOIncentive: Contract;
mtFeeRateModel: Contract; mtFeeRateModel: Contract;
MtFeeRateModelLogic: Contract; MtFeeRateModelLogic: Contract;
MtFeeRateModelLogicUpdate: Contract;
Deployer: string; Deployer: string;
Maintainer: string; Maintainer: string;
@@ -158,7 +157,6 @@ export class ProxyContext {
this.MtFeeRateModelLogic = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_NAME) this.MtFeeRateModelLogic = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_NAME)
this.MtFeeRateModelLogicUpdate = await contracts.newContract(contracts.FEE_RATE_MODEL_LOGIC_UPDATE_NAME)
console.log(log.blueText("[Init DVM context]")); console.log(log.blueText("[Init DVM context]"));