Skip to content

Commit 4544856

Browse files
HoOngEeHoOngEe
committed
Fix the test code
1 parent 05c2cad commit 4544856

11 files changed

+45
-22
lines changed

‎test/src/e2e.dynval/1/dv.changeParams.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ describe("Change commonParams that doesn't affects validator set", function() {
192192
it("should be applied after a term seconds", async function() {
193193
const initialTermSeconds = initialParams.termSeconds;
194194
const newTermSeconds = 5;
195-
const margin = 1.3;
195+
const margin = 1.5;
196196

197197
this.slow((initialTermSeconds + newTermSeconds) * 1000 * margin);
198-
this.timeout((initialTermSeconds + newTermSeconds) * 1000 * 2);
198+
this.timeout((initialTermSeconds + newTermSeconds) * 1000 * 2.5);
199199

200200
const term1Metadata = (await stake.getTermMetadata(nodes[0].sdk))!;
201201
{
@@ -247,8 +247,8 @@ describe("Change commonParams that doesn't affects validator set", function() {
247247
it("Change minimum fee of pay transaction", async function() {
248248
const checkingNode = nodes[0];
249249

250-
this.slow(4_000);
251-
this.timeout(6_000);
250+
this.slow(6_000);
251+
this.timeout(12_000);
252252

253253
const changeTxHash = await changeParams(checkingNode, 1, {
254254
...initialParams,
@@ -284,7 +284,7 @@ describe("Change commonParams that doesn't affects validator set", function() {
284284

285285
it("Should apply larger metadata limit after increment", async function() {
286286
this.slow(6_000);
287-
this.timeout(9_000);
287+
this.timeout(12_000);
288288

289289
const alice = validators[0];
290290
const checkingNode = nodes[0];
@@ -321,7 +321,7 @@ describe("Change commonParams that doesn't affects validator set", function() {
321321

322322
it("Should apply smaller metadata limit after decrement", async function() {
323323
this.slow(6_000);
324-
this.timeout(9_000);
324+
this.timeout(12_000);
325325

326326
const alice = validators[0];
327327
const checkingNode = nodes[0];

‎test/src/e2e.dynval/1/dv.m-m'.test.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ describe("Dynamic Validator M -> M' (Changed the subset, M, M’ = maximum numbe
9797
describe("1. Jail one of the validator", async function() {
9898
const { nodes } = withNodes(this, {
9999
...nodeParams,
100+
overrideParams: {
101+
maxNumOfValidators,
102+
delegationThreshold: 1000,
103+
minDeposit: 10000,
104+
custodyPeriod: 10,
105+
releasePeriod: 30
106+
},
100107
onBeforeEnable: async bootstrappingNodes => {
101108
await bootstrappingNodes[alice].clean(); // alice will be jailed!
102109
}

‎test/src/e2e.dynval/1/dv.n'.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ describe("Dynamic Validator N -> N'", function() {
5252
const betty = validators[4];
5353
const { nodes } = withNodes(this, {
5454
promiseExpect,
55+
overrideParams: {
56+
custodyPeriod: 10,
57+
releasePeriod: 30
58+
},
5559
validators: [
5660
{ signer: validators[0], delegation: 4200, deposit: 100000 },
5761
{ signer: validators[1], delegation: 4100, deposit: 100000 },
@@ -112,6 +116,10 @@ describe("Dynamic Validator N -> N'", function() {
112116
const betty = validators[4];
113117
const { nodes } = withNodes(this, {
114118
promiseExpect,
119+
overrideParams: {
120+
custodyPeriod: 10,
121+
releasePeriod: 30
122+
},
115123
validators: [
116124
{ signer: validators[0], delegation: 4200, deposit: 100000 },
117125
{ signer: validators[1], delegation: 4100, deposit: 100000 },

‎test/src/e2e.dynval/1/dv.n-1.test.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ describe("Dynamic Validator N -> N-1", function() {
7171
describe("A node is imprisoned to jail", async function() {
7272
const { nodes } = withNodes(this, {
7373
promiseExpect,
74+
overrideParams: {
75+
custodyPeriod: 10,
76+
releasePeriod: 30
77+
},
7478
validators: allDynValidators.map((signer, index) => ({
7579
signer,
7680
delegation: 5_000,

‎test/src/e2e.dynval/2/dv.shutdown.test.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ describe("Shutdown test", function() {
5252
overrideParams: {
5353
minNumOfValidators: 4,
5454
maxNumOfValidators: 8,
55-
delegationThreshold: 1
55+
delegationThreshold: 1,
56+
custodyPeriod: 10,
57+
releasePeriod: 30
5658
},
5759
validators: [
5860
// Observer: no self-nomination, no-deposit
@@ -149,7 +151,7 @@ describe("Shutdown test", function() {
149151
.and.to.include.members(getAlphaBetas().addrs);
150152
}
151153

152-
await termWaiter.waitForTermPeriods(1, 0.5);
154+
await termWaiter.waitForTermPeriods(1, 2);
153155
// Revival
154156
await Promise.all(getAlphaBetas().nodes.map(node => node.start()));
155157
await fullyConnect(nodes, promiseExpect);
@@ -196,7 +198,9 @@ describe("Shutdown test", function() {
196198
overrideParams: {
197199
minNumOfValidators: 3,
198200
maxNumOfValidators: 3,
199-
delegationThreshold: 1
201+
delegationThreshold: 1,
202+
custodyPeriod: 10,
203+
releasePeriod: 30
200204
},
201205
validators: [
202206
// Observer: no self-nomination, no deposit
@@ -239,7 +243,7 @@ describe("Shutdown test", function() {
239243
.and.to.include.members(getValidators().addrs);
240244
}
241245

242-
await termWaiter.waitForTermPeriods(2, 0.5);
246+
await termWaiter.waitForTermPeriods(2, 2);
243247
// Revival
244248
await Promise.all(getValidators().nodes.map(node => node.start()));
245249
await fullyConnect(nodes, promiseExpect);

‎test/src/e2e.dynval/setup.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ export const defaultParams = {
354354

355355
termSeconds: 15,
356356
nominationExpiration: 10,
357-
custodyPeriod: 10,
358-
releasePeriod: 30,
357+
custodyPeriod: 0,
358+
releasePeriod: 0,
359359
maxNumOfValidators: 5,
360360
minNumOfValidators: 3,
361361
delegationThreshold: 1000,
@@ -465,7 +465,7 @@ export function setTermTestTimeout(
465465
): TermWaiter {
466466
const { terms, params: { termSeconds } = defaultParams } = options;
467467
const slowMargin = 0.5;
468-
const timeoutMargin = 2.0;
468+
const timeoutMargin = 4.0;
469469
context.slow(termSeconds * (terms + slowMargin) * 1000);
470470
context.timeout(termSeconds * (terms + timeoutMargin) * 1000);
471471
function termPeriodsToTime(termPeriods: number, margin: number): number {
@@ -485,7 +485,7 @@ export function setTermTestTimeout(
485485
) {
486486
await node.waitForTermChange(
487487
waiterParams.target,
488-
termPeriodsToTime(waiterParams.termPeriods, 0.5)
488+
termPeriodsToTime(waiterParams.termPeriods, 2)
489489
);
490490
}
491491
};

‎test/src/e2e.long/mempoolMinfee.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ describe("MemPoolMinFees", async function() {
157157
recipient: validator0Address
158158
});
159159

160-
await Promise.all(nodeArray.map(node => node.waitBlockNumber(4)));
160+
await Promise.all(nodeArray.map(node => node.waitBlockNumber(3)));
161161
const expectedTrues = await Promise.all(
162162
nodeArray.map(node =>
163163
node.sdk.rpc.chain.containsTransaction(

‎test/src/e2e.long/staking.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ import CodeChain from "../helper/spawn";
3737
const RLP = require("rlp");
3838

3939
describe("Staking", function() {
40-
this.timeout(60_000);
40+
this.timeout(80_000);
4141
const promiseExpect = new PromiseExpect();
4242
let nodes: CodeChain[];
4343

4444
beforeEach(async function() {
45-
this.timeout(60_000);
45+
this.timeout(80_000);
4646

4747
const validatorAddresses = [
4848
validator0Address,

‎test/src/e2e/changeParams.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ describe("ChangeParams", function() {
819819
).rejectedWith(/nomination expiration/);
820820
});
821821

822-
it("custody period cannot be zero", async function() {
822+
it.skip("custody period cannot be zero", async function() {
823823
const newParams = [
824824
0x20, // maxExtraDataSize
825825
0x0400, // maxAssetSchemeMetadataSize
@@ -882,7 +882,7 @@ describe("ChangeParams", function() {
882882
).rejectedWith(/custody period/);
883883
});
884884

885-
it("release period cannot be zero", async function() {
885+
it.skip("release period cannot be zero", async function() {
886886
const newParams = [
887887
0x20, // maxExtraDataSize
888888
0x0400, // maxAssetSchemeMetadataSize
@@ -945,7 +945,7 @@ describe("ChangeParams", function() {
945945
).rejectedWith(/release period/);
946946
});
947947

948-
it("A release period cannot be equal to a custody period", async function() {
948+
it.skip("A release period cannot be equal to a custody period", async function() {
949949
const newParams = [
950950
0x20, // maxExtraDataSize
951951
0x0400, // maxAssetSchemeMetadataSize

‎test/src/scheme/tendermint-dynval.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"0xdb3a858d2bafd2cb5382fcf366b847a86b58b42ce1fc29fec0cb0315af881a2ad495045adbdbc86ef7a777b541c4e62a0747f25ff6068a5ec3a052c690c4ff8a",
1010
"0x42829b18de338aa3abf5e6d80cd511121bf9d34be9a135bbace32a3226479e7f3bb6af76c11dcc724a1666a22910d756b075d54d8fdd97be11efd7a0ac3bb222"
1111
],
12-
"timeoutPropose": 2000,
12+
"timeoutPropose": 1500,
1313
"timeoutProposeDelta": 100,
1414
"timeoutPrevote": 1000,
1515
"timeoutPrevoteDelta": 100,

‎test/src/scheme/tendermint-int.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"0xdb3a858d2bafd2cb5382fcf366b847a86b58b42ce1fc29fec0cb0315af881a2ad495045adbdbc86ef7a777b541c4e62a0747f25ff6068a5ec3a052c690c4ff8a",
1010
"0x42829b18de338aa3abf5e6d80cd511121bf9d34be9a135bbace32a3226479e7f3bb6af76c11dcc724a1666a22910d756b075d54d8fdd97be11efd7a0ac3bb222"
1111
],
12-
"timeoutPropose": 1000,
12+
"timeoutPropose": 1500,
1313
"timeoutProposeDelta": 1000,
1414
"timeoutPrevote": 1000,
1515
"timeoutPrevoteDelta": 1000,

0 commit comments

Comments
 (0)