Skip to content

Commit 964b62e

Browse files
author
francois branciard
committed
#42 ajust timeout categories
1 parent cc0fe20 commit 964b62e

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ Features:
1010
Bugfixes:
1111

1212

13+
### v1.0.14 (not released)
14+
15+
Features:
16+
* [#42](https://github.com/iExecBlockchainComputing/PoCo/issues/42) ajust timeout categories
17+
1318
### [v1.0.13](https://github.com/iExecBlockchainComputing/PoCo/releases/tag/v1.0.13)
1419

1520
Features:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ or
492492

493493

494494
```
495-
coverage : 20/05/2018
495+
coverage : 11/06/2018
496496
497497
184 passing (10m)
498498
1 pending

config/categories.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
"description": {
55
"io": "10mo"
66
},
7-
"workClockTimeRef": 30
7+
"workClockTimeRef": 300
88
},
99
{
1010
"name": "2",
1111
"description": {
1212
"io": "100mo"
1313
},
14-
"workClockTimeRef": 120
14+
"workClockTimeRef": 900
1515
},
1616
{
1717
"name": "3",
1818
"description": {
1919
"io": "250mo"
2020
},
21-
"workClockTimeRef": 900
21+
"workClockTimeRef": 1800
2222
},
2323
{
2424
"name": "4",
2525
"description": {
2626
"io": "500mo"
2727
},
28-
"workClockTimeRef": 1800
28+
"workClockTimeRef": 3600
2929
},
3030
{
3131
"name": "5",
3232
"description": {
3333
"io": "1go"
3434
},
35-
"workClockTimeRef": 3600
35+
"workClockTimeRef": 7200
3636
}
3737
]
3838
}

test/byFunctions/WorkerPool/emitWorkOrder.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,11 @@ contract('IexecHub', function(accounts) {
295295
from: iExecCloudUser,
296296
gas:constants.AMOUNT_GAS_PROVIDED
297297
});
298-
assert.strictEqual(getCategoryWorkClockTimeRefCall.toNumber(), 30, "check getCategoryWorkClockTimeRef for cat 1 =30 sec");
298+
assert.strictEqual(getCategoryWorkClockTimeRefCall.toNumber(), 300, "check getCategoryWorkClockTimeRef for cat 1 =300 sec");
299299

300-
assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), timestamp+300, "consensusTimeout = blocktime + 30 *10");
300+
assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), timestamp+3000, "consensusTimeout = blocktime + 300 *10");
301301
//console.log(timestamp+600);
302-
assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), consensusTimeout.toNumber(), "consensusTimeout = blocktime + 30 *5");
302+
assert.strictEqual(timestamp+(getCategoryWorkClockTimeRefCall.toNumber()*10), consensusTimeout.toNumber(), "consensusTimeout = blocktime + 300 *5");
303303

304304
assert.strictEqual(winnerCount.toNumber(), 0, "check no winnerCount");
305305

0 commit comments

Comments
 (0)