Skip to content

Commit 7bf0f4a

Browse files
chore(api): fix eslint errors
1 parent 53af8d0 commit 7bf0f4a

File tree

7 files changed

+31
-25
lines changed

7 files changed

+31
-25
lines changed

api/eslint.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ export default [
2424
'new-cap': 'off',
2525
'no-console': 'error',
2626
'no-underscore-dangle': 'off',
27+
'no-unused-vars': [
28+
'error',
29+
{
30+
ignoreRestSiblings: true,
31+
},
32+
],
2733
'no-template-curly-in-string': 'off',
2834
'max-classes-per-file': 'off',
2935
'max-len': 'off',

api/generateEsModulesFromJson.cjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ const sources = [
6363
];
6464

6565
const createEsModule = (jsonObj) => {
66-
let module =
67-
'// this file is auto generated do not edit it\n/* eslint-disable */\n';
66+
let module = '// this file is auto generated do not edit it\n\n';
6867
Object.entries(jsonObj).forEach(([key, value]) => {
6968
module += `export const ${key} = ${JSON.stringify(value)};\n`;
7069
});

api/src/config.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import iexecTokenDesc from './generated/@iexec/poco/IexecInterfaceToken.js';
2-
import iexecNativeDesc from './generated/@iexec/poco/IexecInterfaceNative.js';
3-
import appRegistryDesc from './generated/@iexec/poco/AppRegistry.js';
4-
import workerpoolRegistryDesc from './generated/@iexec/poco/WorkerpoolRegistry.js';
5-
import datasetRegistryDesc from './generated/@iexec/poco/DatasetRegistry.js';
6-
import appDesc from './generated/@iexec/poco/App.js';
7-
import workerpoolDesc from './generated/@iexec/poco/Workerpool.js';
8-
import datasetDesc from './generated/@iexec/poco/Dataset.js';
1+
import { abi as iexecTokenAbi } from './generated/@iexec/poco/IexecInterfaceToken.js';
2+
import { abi as iexecNativeAbi } from './generated/@iexec/poco/IexecInterfaceNative.js';
3+
import { abi as appRegistryAbi } from './generated/@iexec/poco/AppRegistry.js';
4+
import { abi as workerpoolRegistryAbi } from './generated/@iexec/poco/WorkerpoolRegistry.js';
5+
import { abi as datasetRegistryAbi } from './generated/@iexec/poco/DatasetRegistry.js';
6+
import { abi as appAbi } from './generated/@iexec/poco/App.js';
7+
import { abi as workerpoolAbi } from './generated/@iexec/poco/Workerpool.js';
8+
import { abi as datasetAbi } from './generated/@iexec/poco/Dataset.js';
99

1010
import { logger } from './utils/logger.js';
1111

@@ -27,21 +27,21 @@ const {
2727
const chainsNames = CHAINS.split(',').map((e) => e.toUpperCase());
2828

2929
const abis = {
30-
app: appDesc.abi,
31-
dataset: datasetDesc.abi,
32-
workerpool: workerpoolDesc.abi,
33-
appregistry: appRegistryDesc.abi,
34-
datasetregistry: datasetRegistryDesc.abi,
35-
workerpoolregistry: workerpoolRegistryDesc.abi,
30+
app: appAbi,
31+
dataset: datasetAbi,
32+
workerpool: workerpoolAbi,
33+
appregistry: appRegistryAbi,
34+
datasetregistry: datasetRegistryAbi,
35+
workerpoolregistry: workerpoolRegistryAbi,
3636
};
3737

3838
const tokenAbis = {
39-
hub: iexecTokenDesc.abi,
39+
hub: iexecTokenAbi,
4040
...abis,
4141
};
4242

4343
const nativeAbis = {
44-
hub: iexecNativeDesc.abi,
44+
hub: iexecNativeAbi,
4545
...abis,
4646
};
4747

api/src/controllers/ratelimit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ const getRatelimitMiddleware = ({ maxRequest, period }) => {
3030
)
3131
return true;
3232
// allow localhost
33-
if (ctx.ip === '::ffff:127.0.0.1') return true;
34-
return false;
33+
// eslint-disable-next-line sonarjs/no-hardcoded-ip
34+
return ctx.ip === '::ffff:127.0.0.1';
3535
},
3636
});
3737
};

api/src/models/common.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const addressValidator = {
66
try {
77
getAddress(address);
88
return true;
9-
} catch (e) {
9+
} catch {
1010
return false;
1111
}
1212
},
@@ -20,7 +20,7 @@ const bytes32validator = {
2020

2121
const timestampValidator = {
2222
validator: (str) =>
23-
/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T(2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9].[0-9][0-9][0-9]Z$/.test(
23+
/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])T(2[0-3]|[01]\d):[0-5]\d:[0-5]\d.\d\d\dZ$/.test(
2424
str,
2525
),
2626
message: '{PATH} is not a valid timestamp',

api/src/utils/error.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable sonarjs/no-identical-functions */
12
import { ValidationError } from 'yup';
23
import { logError } from './logger.js';
34

api/src/utils/validator.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ const positiveStrictIntSchema = () =>
2424

2525
const timestampSchema = () =>
2626
string().match(
27-
/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T(2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9].[0-9][0-9][0-9]Z$/,
27+
/^\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])T(2[0-3]|[01]\d):[0-5]\d:[0-5]\d.\d\d\dZ$/,
2828
'${path} must be a timestamp (2019-09-11T10:03:38.068Z is a valid timestamp)',
2929
);
3030

3131
const transformAddress = (value) => {
3232
try {
3333
return getAddress(value.toLowerCase());
34-
} catch (e) {
34+
} catch {
3535
return value;
3636
}
3737
};
@@ -40,7 +40,7 @@ const isAddress = (value) => {
4040
try {
4141
getAddress(value);
4242
return true;
43-
} catch (e) {
43+
} catch {
4444
return false;
4545
}
4646
};

0 commit comments

Comments
 (0)