Skip to content

Commit f790d79

Browse files
PierreJeanjacquotPierreJeanjacquot
committed
chore: remove CLI partial implementation
1 parent 81052af commit f790d79

File tree

4 files changed

+0
-26
lines changed

4 files changed

+0
-26
lines changed

‎CLI.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,6 @@ Options:
10671067
| --dataset \<address\|"deployed"\> | dataset address, use "deployed" to use last deployed from "deployed.json" |
10681068
| --workerpool \<address\|"deployed"\> | workerpool address, use "deployed" to use last deployed from "deployed.json" |
10691069
| --args \<string\> | specify the arguments to pass to the app |
1070-
| --bulk-cid \<CID\> | specify the bulk CID to use for the request |
10711070
| --input-files \<fileUrl\> | specify the URL of input files to be used by the app<br/>\* usage: --input-files https://example.com/foo.txt,https://example.com/bar.zip |
10721071
| --secret \<secretMapping...\> | specify the requester secrets mappings (\<appSecretKey\>=\<requesterSecretName\>) to use in the app (only available for TEE tasks, use with --tag tee)<br/>\* usage: <br/> \* \[command\] \[args\] --secret 1=login 2=password<br/> \* \[command\] \[args\] --secret 1=login --secret 2=password<br/> \* \[command\] --secret 1=login --secret 2=password -- \[args\]<br/>\* please note that this option is variadic, any number of mappings can be passed, use `--` to stop the list<br/> |
10731072
| --category \<id\> | id of the task category |
@@ -1110,7 +1109,6 @@ Options:
11101109
| --dataset-price \<amount unit...\> | dataset price per task (default unit nRLC) |
11111110
| --workerpool-price \<amount unit...\> | workerpool price per task (default unit nRLC) |
11121111
| --args \<string\> | specify the arguments to pass to the app |
1113-
| --bulk-cid \<CID\> | specify the bulk CID to use for the request |
11141112
| --input-files \<fileUrl\> | specify the URL of input files to be used by the app<br/>\* usage: --input-files https://example.com/foo.txt,https://example.com/bar.zip |
11151113
| --secret \<secretMapping...\> | specify the requester secrets mappings (\<appSecretKey\>=\<requesterSecretName\>) to use in the app (only available for TEE tasks, use with --tag tee)<br/>\* usage: <br/> \* \[command\] \[args\] --secret 1=login 2=password<br/> \* \[command\] \[args\] --secret 1=login --secret 2=password<br/> \* \[command\] --secret 1=login --secret 2=password -- \[args\]<br/>\* please note that this option is variadic, any number of mappings can be passed, use `--` to stop the list<br/> |
11161114
| --category \<id\> | id of the task category |
@@ -1978,7 +1976,6 @@ Options:
19781976
| --app-strict | fetch orders created strictly for the specified app |
19791977
| --requester-strict | fetch orders created strictly for the specified requester |
19801978
| --workerpool-strict | fetch orders created strictly for the specified workerpool |
1981-
| --bulk-only | only include bulk orders |
19821979

19831980
#### iexec orderbook workerpool
19841981

‎src/cli/cmd/iexec-app.js‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
datasetorderSchema,
2020
apporderSchema,
2121
requestorderSchema,
22-
stringSchema,
2322
} from '../../common/utils/validator.js';
2423
import { sconeTeeApp, gramineTeeApp } from '../utils/templates.js';
2524
import {
@@ -575,7 +574,6 @@ run
575574
.option(...orderOption.dataset())
576575
.option(...orderOption.workerpool())
577576
.option(...orderOption.requestArgs())
578-
.option(...orderOption.requestBulkCid())
579577
.option(...orderOption.requestInputFiles())
580578
.option(...orderOption.requestSecrets())
581579
.option(...orderOption.category())
@@ -676,8 +674,6 @@ run
676674

677675
const inputParams = await paramsSchema().validate(opts.params);
678676
const inputParamsArgs = await paramsArgsSchema().validate(opts.args);
679-
// TODO bulkCid validation
680-
const inputParamsBulkCid = await stringSchema().validate(opts.bulkCid);
681677
const inputParamsInputFiles =
682678
await paramsInputFilesArraySchema().validate(opts.inputFiles);
683679

@@ -712,9 +708,6 @@ run
712708
...(inputParamsArgs !== undefined && {
713709
[IEXEC_REQUEST_PARAMS.IEXEC_ARGS]: inputParamsArgs,
714710
}),
715-
...(inputParamsBulkCid !== undefined && {
716-
[IEXEC_REQUEST_PARAMS.IEXEC_BULK_CID]: inputParamsBulkCid,
717-
}),
718711
...(inputParamsInputFiles !== undefined && {
719712
[IEXEC_REQUEST_PARAMS.IEXEC_INPUT_FILES]: inputParamsInputFiles,
720713
}),
@@ -1179,7 +1172,6 @@ requestRun
11791172
.option(...orderOption.datasetprice())
11801173
.option(...orderOption.workerpoolprice())
11811174
.option(...orderOption.requestArgs())
1182-
.option(...orderOption.requestBulkCid())
11831175
.option(...orderOption.requestInputFiles())
11841176
.option(...orderOption.requestSecrets())
11851177
.option(...orderOption.category())
@@ -1239,8 +1231,6 @@ requestRun
12391231

12401232
const inputParams = await paramsSchema().validate(opts.params);
12411233
const inputParamsArgs = await paramsArgsSchema().validate(opts.args);
1242-
// TODO bulkCid validation
1243-
const inputParamsBulkCid = await stringSchema().validate(opts.bulkCid);
12441234
const inputParamsInputFiles =
12451235
await paramsInputFilesArraySchema().validate(opts.inputFiles);
12461236
const inputParamsSecrets =
@@ -1274,9 +1264,6 @@ requestRun
12741264
...(inputParamsArgs !== undefined && {
12751265
[IEXEC_REQUEST_PARAMS.IEXEC_ARGS]: inputParamsArgs,
12761266
}),
1277-
...(inputParamsBulkCid !== undefined && {
1278-
[IEXEC_REQUEST_PARAMS.IEXEC_BULK_CID]: inputParamsBulkCid,
1279-
}),
12801267
...(inputParamsInputFiles !== undefined && {
12811268
[IEXEC_REQUEST_PARAMS.IEXEC_INPUT_FILES]: inputParamsInputFiles,
12821269
}),

‎src/cli/cmd/iexec-orderbook.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ orderbookDataset
155155
.option(...option.isAppStrict())
156156
.option(...option.isRequesterStrict())
157157
.option(...option.isWorkerpoolStrict())
158-
.option(...option.bulkOnly())
159158
.description(desc.showObj('dataset orderbook', 'marketplace'))
160159
.action(async (dataset, opts) => {
161160
await checkUpdate(opts);
@@ -176,7 +175,6 @@ orderbookDataset
176175
isAppStrict,
177176
isRequesterStrict,
178177
isWorkerpoolStrict,
179-
bulkOnly,
180178
} = opts;
181179
const request = fetchDatasetOrderbook(
182180
chain.contracts,
@@ -192,7 +190,6 @@ orderbookDataset
192190
isAppStrict,
193191
isRequesterStrict,
194192
isWorkerpoolStrict,
195-
bulkOnly,
196193
},
197194
);
198195
const fetchMessage = info.showing(objName);
@@ -207,7 +204,6 @@ orderbookDataset
207204
apprestrict: e.order.apprestrict,
208205
workerpoolrestrict: e.order.workerpoolrestrict,
209206
requesterrestrict: e.order.requesterrestrict,
210-
bulk: e.bulk,
211207
}))
212208
: [];
213209
const createResultsMessage = (
@@ -222,7 +218,6 @@ orderbookDataset
222218
orderHash: e.orderHash,
223219
price: e.price,
224220
remaining: e.remaining,
225-
...(e.bulk && { bulk: e.bulk }),
226221
...(e.tag !== NULL_BYTES32 && { tag: e.tag }),
227222
...(e.apprestrict !== NULL_ADDRESS && {
228223
apprestrict: e.apprestrict,

‎src/cli/utils/cli-helper.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ export const option = {
312312
minVolume: () => ['--min-volume <integer>', 'specify minimum volume'],
313313
minTrust: () => ['--min-trust <integer>', 'specify minimum trust'],
314314
maxTrust: () => ['--max-trust <integer>', 'specify maximum trust'],
315-
bulkOnly: () => ['--bulk-only', 'only include bulk orders'],
316315
password: () => [
317316
'--password <password>',
318317
'password used to encrypt the wallet (unsafe)',
@@ -499,10 +498,6 @@ export const orderOption = {
499498
'--args <string>',
500499
'specify the arguments to pass to the app',
501500
],
502-
requestBulkCid: () => [
503-
'--bulk-cid <CID>',
504-
'specify the bulk CID to use for the request',
505-
],
506501
requestSecrets: () => [
507502
'--secret <secretMapping...>',
508503
'specify the requester secrets mappings (<appSecretKey>=<requesterSecretName>) to use in the app (only available for TEE tasks, use with --tag tee)\n* usage: \n * [command] [args] --secret 1=login 2=password\n * [command] [args] --secret 1=login --secret 2=password\n * [command] --secret 1=login --secret 2=password -- [args]\n* please note that this option is variadic, any number of mappings can be passed, use `--` to stop the list\n',

0 commit comments

Comments
 (0)