Skip to content

Commit 67f1f4b

Browse files
abbesBenayachePierreJeanjacquot
authored andcommitted
refactor: compute datasetFilename from index inside processProtectedData
1 parent ec9464b commit 67f1f4b

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

dapp/src/executeTask.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ async function processProtectedData({
2525
IEXEC_OUT,
2626
appDeveloperSecret,
2727
requesterSecret,
28-
datasetFilename = null,
2928
}) {
29+
const datasetFilename =
30+
index > 0 ? process.env[`IEXEC_DATASET_${index}_FILENAME`] : null;
31+
3032
// Parse the protected data
3133
let protectedData;
3234
try {
@@ -113,27 +115,28 @@ async function start() {
113115
// Process multiple protected data
114116
const promises = [];
115117
for (let index = 1; index <= bulkSize; index += 1) {
116-
const datasetFilename = process.env[`IEXEC_DATASET_${index}_FILENAME`];
117-
118118
const promise = processProtectedData({
119119
index,
120120
IEXEC_IN,
121121
IEXEC_OUT: workerEnv.IEXEC_OUT,
122122
appDeveloperSecret,
123123
requesterSecret,
124-
datasetFilename,
125124
})
126125
.then((result) => result)
127-
.catch((error) => ({
128-
index,
129-
resultFileName: datasetFilename
130-
? `${datasetFilename}.txt`
131-
: `dataset-${index}.txt`,
132-
response: {
133-
status: 500,
134-
message: `Failed to process dataset ${index}: ${error.message}`,
135-
},
136-
}));
126+
.catch((error) => {
127+
const datasetFilename =
128+
process.env[`IEXEC_DATASET_${index}_FILENAME`];
129+
return {
130+
index,
131+
resultFileName: datasetFilename
132+
? `${datasetFilename}.txt`
133+
: `dataset-${index}.txt`,
134+
response: {
135+
status: 500,
136+
message: `Failed to process dataset ${index}: ${error.message}`,
137+
},
138+
};
139+
});
137140

138141
promises.push(promise);
139142
}

0 commit comments

Comments
 (0)