Skip to content

Commit 779957e

Browse files
author
francois branciard
committed
tests need to be udtated for #28 and #29. and set marketplace to public in IexecHub
1 parent 2206aa7 commit 779957e

File tree

4 files changed

+3
-25
lines changed

4 files changed

+3
-25
lines changed

contracts/IexecHub.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ contract IexecHub
3838
/**
3939
* Market place
4040
*/
41-
Marketplace marketplace;
41+
Marketplace public marketplace;
4242
modifier onlyMarketplace()
4343
{
4444
require(msg.sender == address(marketplace));

test/byFunctions/IexecAPI/buyForWorkOrder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ contract('IexecHub', function(accounts) {
259259
it("buyForWorkOrder_01: test buyForWorkOrder from a smart contract", async function() {
260260

261261

262-
aIexecAPIInstance = await IexecAPI.new(aIexecHubInstance.address, aMarketplaceInstance.address, aRLCInstance.address,{
262+
aIexecAPIInstance = await IexecAPI.new(aIexecHubInstance.address, aMarketplaceInstance.address, {
263263
from: iExecCloudUser
264264
});
265265
console.log("aIexecAPIInstance created "+aIexecAPIInstance.address);

test/byFunctions/IexecHub/attachMarketplace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ contract('IexecHub', function(accounts) {
166166
gas : constants.AMOUNT_GAS_PROVIDED
167167
});
168168
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
169-
let marketplaceAddressCall = await aIexecHubInstance.marketplaceAddress.call();
169+
let marketplaceAddressCall = await aIexecHubInstance.marketplace.call();
170170
assert.strictEqual(marketplaceAddressCall, aMarketplaceInstance.address, "check marketplaceAddress in aIexecHubInstance");
171171
});
172172

test/byFunctions/IexecHub/setCategoriesCreator.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -219,28 +219,6 @@ contract('IexecHub', function(accounts) {
219219

220220
});
221221

222-
it("setCategoriesCreator_03 : it should be possible for any user to setCategoriesCreator to himself", async function() {
223-
224-
txMined = await aIexecHubInstance.setCategoriesCreator(iExecCloudUser, {
225-
from: iExecCloudUser,
226-
gas: constants.AMOUNT_GAS_PROVIDED
227-
});
228-
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
229-
230-
let categoriesCreatorCall = await aIexecHubInstance.m_categoriesCreator.call();
231-
assert.strictEqual(categoriesCreatorCall, iExecCloudUser, "check m_categoriesCreator in aIexecHubInstance");
232-
233-
});
234-
235-
it("setCategoriesCreator_04 : it should be possible for any user to setCategoriesCreator to others users", async function() {
236-
txMined = await aIexecHubInstance.setCategoriesCreator(resourceProvider, {
237-
from: iExecCloudUser,
238-
gas: constants.AMOUNT_GAS_PROVIDED
239-
});
240-
assert.isBelow(txMined.receipt.gasUsed, constants.AMOUNT_GAS_PROVIDED, "should not use all gas");
241-
let categoriesCreatorCall = await aIexecHubInstance.m_categoriesCreator.call();
242-
assert.strictEqual(categoriesCreatorCall, resourceProvider, "check m_categoriesCreator in aIexecHubInstance");
243-
});
244222

245223
it("setCategoriesCreator_05 : when m_categoriesCreator is valorized. it must not be possible to others users to call setCategoriesCreator", async function() {
246224
txMined = await aIexecHubInstance.setCategoriesCreator(marketplaceCreator, {

0 commit comments

Comments
 (0)