Skip to content

Commit 2ff0602

Browse files
author
francois branciard
committed
update uml + fix event name + fix missing event + update readme
1 parent 73be123 commit 2ff0602

31 files changed

+767
-712
lines changed

‎README.md‎

Lines changed: 106 additions & 309 deletions
Large diffs are not rendered by default.

‎contracts/Marketplace.sol‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ contract Marketplace is IexecHubAccessor
1919
/**
2020
* Events
2121
*/
22-
event MarketOrderEmitted (uint marketorderIdx);
22+
event MarketOrderCreated (uint marketorderIdx);
2323
event MarketOrderClosed (uint marketorderIdx);
2424
event MarketOrderAskConsume(uint marketorderIdx, address requester);
2525

@@ -69,7 +69,7 @@ contract Marketplace is IexecHubAccessor
6969
// no BID implementation
7070
revert();
7171
}
72-
emit MarketOrderEmitted(m_orderCount);
72+
emit MarketOrderCreated(m_orderCount);
7373
return m_orderCount;
7474
}
7575

‎contracts/SafeMathOZ.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.4.21;
44
/**
55
* @title SafeMath
66
* @dev Math operations with safety checks that throw on error
7-
* last open zepplin version : https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/contracts/math/SafeMath.sol
7+
* last open zepplin version used for : add sub mul div function : https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/contracts/math/SafeMath.sol
88
* commit : https://github.com/OpenZeppelin/zeppelin-solidity/commit/815d9e1f457f57cfbb1b4e889f2255c9a517f661
99
*/
1010
library SafeMathOZ

‎contracts/TestSha.sol‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
pragma solidity ^0.4.21;
22

3+
4+
//smart contract for testing purpose only
5+
36
contract TestSha
47
{
58
event SolidityKeccak256FromBytes (bytes32 result, bytes32 input);

‎contracts/WorkerPool.sol‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
5454
event Contribute (address indexed woid, address indexed worker, bytes32 resultHash);
5555
event RevealConsensus (address indexed woid, bytes32 consensus);
5656
event Reveal (address indexed woid, address indexed worker, bytes32 result);
57+
event Reopen (address indexed woid);
58+
event FinalizeWork (address indexed woid, string stdout, string stderr, string uri);
59+
5760

5861
event WorkerSubscribe (address indexed worker);
5962
event WorkerUnsubscribe (address indexed worker);
@@ -378,6 +381,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
378381
consensus.winnerCount = 0;
379382
consensus.consensus = 0x0;
380383
consensus.revealDate = 0;
384+
emit Reopen(_woid);
381385
return true;
382386
}
383387

@@ -392,6 +396,7 @@ contract WorkerPool is OwnableOZ, IexecHubAccessor, MarketplaceAccessor
392396
require(distributeRewards(_woid, consensus));
393397

394398
require(iexecHubInterface.finalizeWorkOrder(_woid, _stdout, _stderr, _uri));
399+
emit FinalizeWork(_woid,_stdout,_stderr,_uri);
395400
return true;
396401
}
397402

‎test/04_createMarketOrderAsk.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ contract('IexecHub', function(accounts) {
268268
from: scheduleProvider
269269
});
270270

271-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}),1,constants.EVENT_WAIT_TIMEOUT);
271+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}),1,constants.EVENT_WAIT_TIMEOUT);
272272
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
273273

274274
[direction,category,trust,value,volume,remaining,workerpool,workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);

‎test/byFunctions/Marketplace/closeMarketOrder.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ contract('IexecHub', function(accounts) {
317317
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
318318

319319

320-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
320+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
321321
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
322322

323323
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -378,7 +378,7 @@ contract('IexecHub', function(accounts) {
378378
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
379379

380380

381-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
381+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
382382
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
383383

384384
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -422,7 +422,7 @@ contract('IexecHub', function(accounts) {
422422
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
423423

424424

425-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
425+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
426426
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
427427

428428
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -490,7 +490,7 @@ contract('IexecHub', function(accounts) {
490490
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
491491

492492

493-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
493+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
494494
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
495495

496496
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);

‎test/byFunctions/Marketplace/consumeMarketOrderAsk.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ contract('IexecHub', function(accounts) {
307307
from: scheduleProvider
308308
});
309309

310-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
310+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
311311
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
312312

313313
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -364,7 +364,7 @@ contract('IexecHub', function(accounts) {
364364
from: scheduleProvider
365365
});
366366

367-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
367+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
368368
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
369369

370370
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -422,7 +422,7 @@ contract('IexecHub', function(accounts) {
422422
from: scheduleProvider
423423
});
424424

425-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
425+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
426426
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
427427

428428
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -488,7 +488,7 @@ contract('IexecHub', function(accounts) {
488488
from: scheduleProvider
489489
});
490490

491-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
491+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
492492
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
493493

494494
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -529,7 +529,7 @@ contract('IexecHub', function(accounts) {
529529
from: scheduleProvider
530530
});
531531

532-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
532+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
533533
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
534534

535535
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -580,7 +580,7 @@ contract('IexecHub', function(accounts) {
580580
from: scheduleProvider
581581
});
582582

583-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
583+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
584584
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
585585

586586
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);

‎test/byFunctions/Marketplace/createMarketOrder.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ contract('IexecHub', function(accounts) {
310310
from: scheduleProvider
311311
});
312312

313-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
313+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
314314
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
315315

316316
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -444,7 +444,7 @@ contract('IexecHub', function(accounts) {
444444
from: scheduleProvider
445445
});
446446

447-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
447+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
448448
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
449449

450450
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -523,7 +523,7 @@ contract('IexecHub', function(accounts) {
523523
from: scheduleProvider
524524
});
525525

526-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
526+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
527527
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
528528

529529
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);
@@ -550,7 +550,7 @@ contract('IexecHub', function(accounts) {
550550
from: scheduleProvider
551551
});
552552

553-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
553+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
554554
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 2, "marketorderIdx");
555555

556556
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(2);
@@ -583,7 +583,7 @@ contract('IexecHub', function(accounts) {
583583
from: scheduleProvider
584584
});
585585

586-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
586+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
587587
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
588588

589589
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1);

‎test/byFunctions/Marketplace/getMarketOrder.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ contract('IexecHub', function(accounts) {
310310
from: scheduleProvider
311311
});
312312

313-
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderEmitted({}), 1, constants.EVENT_WAIT_TIMEOUT);
313+
events = await Extensions.getEventsPromise(aMarketplaceInstance.MarketOrderCreated({}), 1, constants.EVENT_WAIT_TIMEOUT);
314314
assert.strictEqual(events[0].args.marketorderIdx.toNumber(), 1, "marketorderIdx");
315315

316316
[direction, category, trust, value, volume, remaining, workerpool, workerpoolOwner] = await aMarketplaceInstance.getMarketOrder.call(1,{

0 commit comments

Comments
 (0)