Skip to content

Commit f624ca8

Browse files
author
francois branciard
committed
fix error typo see issue #27 
1 parent ff5d288 commit f624ca8

File tree

12 files changed

+106
-106
lines changed

12 files changed

+106
-106
lines changed

‎contracts/IexecHub.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ contract IexecHub
505505
require(seize(_worker, _amount));
506506
if (_reputation)
507507
{
508-
m_contributionHistory.failled = m_contributionHistory.failled.add(1);
508+
m_contributionHistory.failed = m_contributionHistory.failed.add(1);
509509
m_scores[_worker] = m_scores[_worker].sub(m_scores[_worker].min(SCORE_UNITARY_SLASH));
510510
emit FaultyContribution(_woid, _worker);
511511
}

‎contracts/IexecLib.sol‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ library IexecLib
3232
UNSET, // Work order not yet initialized (invalid address)
3333
ACTIVE, // Marketed → constributions are open
3434
REVEALING, // Starting consensus reveal
35-
CLAIMED, // Failled consensus
35+
CLAIMED, // failed consensus
3636
COMPLETED // Concensus achieved
3737
}
3838

@@ -48,7 +48,7 @@ library IexecLib
4848
bytes32 consensus;
4949
uint256 revealDate;
5050
uint256 revealCounter;
51-
uint256 consensusTimout;
51+
uint256 consensusTimeout;
5252
uint256 winnerCount;
5353
address[] contributors;
5454
address workerpoolOwner;
@@ -90,10 +90,10 @@ library IexecLib
9090
uint256 locked;
9191
}
9292

93-
struct ContributionHistory // for credibility computation, f = failled/total
93+
struct ContributionHistory // for credibility computation, f = failed/total
9494
{
9595
uint256 success;
96-
uint256 failled;
96+
uint256 failed;
9797
}
9898

9999
struct Category

‎contracts/WorkerPool.sol‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
176176
bytes32 c_consensus,
177177
uint256 c_revealDate,
178178
uint256 c_revealCounter,
179-
uint256 c_consensusTimout,
179+
uint256 c_consensusTimeout,
180180
uint256 c_winnerCount,
181181
address c_workerpoolOwner)
182182
{
@@ -187,7 +187,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
187187
consensus.consensus,
188188
consensus.revealDate,
189189
consensus.revealCounter,
190-
consensus.consensusTimout,
190+
consensus.consensusTimeout,
191191
consensus.winnerCount,
192192
consensus.workerpoolOwner
193193
);
@@ -240,7 +240,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
240240
consensus.poolReward = marketplaceInterface.getMarketOrderValue(_marketorderIdx);
241241
consensus.workerpoolOwner = marketplaceInterface.getMarketOrderWorkerpoolOwner(_marketorderIdx);
242242
consensus.stakeAmount = consensus.poolReward.percentage(m_stakeRatioPolicy);
243-
consensus.consensusTimout = timeout;
243+
consensus.consensusTimeout = timeout;
244244
consensus.schedulerRewardRatioPolicy = m_schedulerRewardRatioPolicy;
245245

246246
emit WorkOrderActive(_woid);
@@ -251,7 +251,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
251251
function claimFailedConsensus(address _woid) public onlyIexecHub returns (bool)
252252
{
253253
IexecLib.Consensus storage consensus = m_consensus[_woid];
254-
require(now > consensus.consensusTimout);
254+
require(now > consensus.consensusTimeout);
255255
uint256 i;
256256
address w;
257257
for (i = 0; i < consensus.contributors.length; ++i)
@@ -281,7 +281,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
281281
require(WorkOrder(_woid).m_status() == IexecLib.WorkOrderStatusEnum.ACTIVE);
282282
IexecLib.Contribution storage contribution = m_contributions[_woid][_worker];
283283
IexecLib.Consensus storage consensus = m_consensus[_woid];
284-
require(now <= consensus.consensusTimout);
284+
require(now <= consensus.consensusTimeout);
285285

286286
address workerPool;
287287
uint256 workerScore;
@@ -300,7 +300,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
300300
{
301301
require(iexecHubInterface.isWoidRegistred(_woid));
302302
IexecLib.Consensus storage consensus = m_consensus[_woid];
303-
require(now <= consensus.consensusTimout);
303+
require(now <= consensus.consensusTimeout);
304304
require(WorkOrder(_woid).m_status() == IexecLib.WorkOrderStatusEnum.ACTIVE); // can't contribute on a claimed or completed workorder
305305
IexecLib.Contribution storage contribution = m_contributions[_woid][msg.sender];
306306

@@ -328,7 +328,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
328328
{
329329
require(iexecHubInterface.isWoidRegistred(_woid));
330330
IexecLib.Consensus storage consensus = m_consensus[_woid];
331-
require(now <= consensus.consensusTimout);
331+
require(now <= consensus.consensusTimeout);
332332
require(WorkOrder(_woid).startRevealingPhase());
333333

334334
consensus.winnerCount = 0;
@@ -356,7 +356,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
356356
{
357357
require(iexecHubInterface.isWoidRegistred(_woid));
358358
IexecLib.Consensus storage consensus = m_consensus[_woid];
359-
require(now <= consensus.consensusTimout);
359+
require(now <= consensus.consensusTimeout);
360360
IexecLib.Contribution storage contribution = m_contributions[_woid][msg.sender];
361361

362362
require(WorkOrder(_woid).m_status() == IexecLib.WorkOrderStatusEnum.REVEALING );
@@ -377,7 +377,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
377377
{
378378
require(iexecHubInterface.isWoidRegistred(_woid));
379379
IexecLib.Consensus storage consensus = m_consensus[_woid];
380-
require(now <= consensus.consensusTimout);
380+
require(now <= consensus.consensusTimeout);
381381
require(consensus.revealDate <= now && consensus.revealCounter == 0);
382382
require(WorkOrder(_woid).reActivate());
383383

@@ -402,7 +402,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
402402
{
403403
require(iexecHubInterface.isWoidRegistred(_woid));
404404
IexecLib.Consensus storage consensus = m_consensus[_woid];
405-
require(now <= consensus.consensusTimout);
405+
require(now <= consensus.consensusTimeout);
406406
require((consensus.revealDate <= now && consensus.revealCounter > 0) || (consensus.revealCounter == consensus.winnerCount)); // consensus.winnerCount never 0 at this step
407407

408408
// add penalized to the call worker to contribution and they never contribute ?

‎test/byFunctions/IexecAPI/workOrderCallback.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ contract('IexecHub', function(accounts) {
417417
assert.strictEqual(events[0].args.result, '0x5def3ac0554e7a443f84985aa9629864e81d71d59e0649ddad3d618f85a1bf4b', "check revealed result by resourceProvider");
418418
assert.strictEqual(events[0].args.result, web3.sha3("iExec the wanderer"), "check revealed result by resourceProvider");
419419

420-
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
420+
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimeout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
421421
from: iExecCloudUser,
422422
gas: constants.AMOUNT_GAS_PROVIDED
423423
});
@@ -436,7 +436,7 @@ contract('IexecHub', function(accounts) {
436436
assert.strictEqual(consensus, '0x2fa3c6dc29e10dfc01cea7e9443ffe431e6564e74f5dcf4de4b04f2e5d343d70', "check consensus");
437437
assert.isTrue(revealDate.toNumber() > 0, "check revealDate > 0");
438438
assert.strictEqual(revealCounter.toNumber(), 1, "check revealCounter 1 now");
439-
assert.isTrue(consensusTimout.toNumber() > 0, "check consensusTimout > 0");
439+
assert.isTrue(consensusTimeout.toNumber() > 0, "check consensusTimeout > 0");
440440
assert.strictEqual(winnerCount.toNumber(), 1, "check 1 winnerCount");
441441

442442

‎test/byFunctions/Marketplace/workOrderCallback.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ contract('IexecHub', function(accounts) {
421421
assert.strictEqual(events[0].args.result, '0x5def3ac0554e7a443f84985aa9629864e81d71d59e0649ddad3d618f85a1bf4b', "check revealed result by resourceProvider");
422422
assert.strictEqual(events[0].args.result, web3.sha3("iExec the wanderer"), "check revealed result by resourceProvider");
423423

424-
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
424+
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimeout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
425425
from: iExecCloudUser,
426426
gas: constants.AMOUNT_GAS_PROVIDED
427427
});
@@ -440,7 +440,7 @@ contract('IexecHub', function(accounts) {
440440
assert.strictEqual(consensus, '0x2fa3c6dc29e10dfc01cea7e9443ffe431e6564e74f5dcf4de4b04f2e5d343d70', "check consensus");
441441
assert.isTrue(revealDate.toNumber() > 0, "check revealDate > 0");
442442
assert.strictEqual(revealCounter.toNumber(), 1, "check revealCounter 1 now");
443-
assert.isTrue(consensusTimout.toNumber() > 0, "check consensusTimout > 0");
443+
assert.isTrue(consensusTimeout.toNumber() > 0, "check consensusTimeout > 0");
444444
assert.strictEqual(winnerCount.toNumber(), 1, "check 1 winnerCount");
445445

446446

@@ -649,7 +649,7 @@ contract('IexecHub', function(accounts) {
649649
assert.strictEqual(events[0].args.result, '0x5def3ac0554e7a443f84985aa9629864e81d71d59e0649ddad3d618f85a1bf4b', "check revealed result by resourceProvider");
650650
assert.strictEqual(events[0].args.result, web3.sha3("iExec the wanderer"), "check revealed result by resourceProvider");
651651

652-
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
652+
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimeout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
653653
from: iExecCloudUser,
654654
gas: constants.AMOUNT_GAS_PROVIDED
655655
});
@@ -668,7 +668,7 @@ contract('IexecHub', function(accounts) {
668668
assert.strictEqual(consensus, '0x2fa3c6dc29e10dfc01cea7e9443ffe431e6564e74f5dcf4de4b04f2e5d343d70', "check consensus");
669669
assert.isTrue(revealDate.toNumber() > 0, "check revealDate > 0");
670670
assert.strictEqual(revealCounter.toNumber(), 1, "check revealCounter 1 now");
671-
assert.isTrue(consensusTimout.toNumber() > 0, "check consensusTimout > 0");
671+
assert.isTrue(consensusTimeout.toNumber() > 0, "check consensusTimeout > 0");
672672
assert.strictEqual(winnerCount.toNumber(), 1, "check 1 winnerCount");
673673

674674

@@ -867,7 +867,7 @@ contract('IexecHub', function(accounts) {
867867
assert.strictEqual(events[0].args.result, '0x5def3ac0554e7a443f84985aa9629864e81d71d59e0649ddad3d618f85a1bf4b', "check revealed result by resourceProvider");
868868
assert.strictEqual(events[0].args.result, web3.sha3("iExec the wanderer"), "check revealed result by resourceProvider");
869869

870-
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
870+
[poolReward, stakeAmount, consensus, revealDate, revealCounter, consensusTimeout, winnerCount] = await aWorkerPoolInstance.getConsensusDetails.call(woid, {
871871
from: iExecCloudUser,
872872
gas: constants.AMOUNT_GAS_PROVIDED
873873
});
@@ -886,7 +886,7 @@ contract('IexecHub', function(accounts) {
886886
assert.strictEqual(consensus, '0x2fa3c6dc29e10dfc01cea7e9443ffe431e6564e74f5dcf4de4b04f2e5d343d70', "check consensus");
887887
assert.isTrue(revealDate.toNumber() > 0, "check revealDate > 0");
888888
assert.strictEqual(revealCounter.toNumber(), 1, "check revealCounter 1 now");
889-
assert.isTrue(consensusTimout.toNumber() > 0, "check consensusTimout > 0");
889+
assert.isTrue(consensusTimeout.toNumber() > 0, "check consensusTimeout > 0");
890890
assert.strictEqual(winnerCount.toNumber(), 1, "check 1 winnerCount");
891891

892892

‎test/byFunctions/WorkerPool/allowWorkerToContribute.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ contract('IexecHub', function(accounts) {
441441
});
442442

443443

444-
it("allowWorkerToContribute_05: scheduler can't allowWorkerToContribute on worker after the consensusTimout", async function() {
444+
it("allowWorkerToContribute_05: scheduler can't allowWorkerToContribute on worker after the consensusTimeout", async function() {
445445

446446
if (!isTestRPC) this.skip("This test is only for TestRPC");
447447
// WORKER SUBSCRIBE TO POOL

0 commit comments

Comments
 (0)