Skip to content

Commit d78bede

Browse files
jeremy-thenjeremy-then
committed
Fixes sonar complains
1 parent 116897c commit d78bede

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

‎config/regtest-key-files-and-hsms.js‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@ module.exports = {
287287
'peer.active.2.port': 50004,
288288
'peer.active.2.nodeId': '328105ab6744914e61bcfcb729d741f23528fd6eb1b42628120ab027d82c9c2d8c445f8c6727e291e1abcaa8398bf47d4cca6ea6600b137b875b8df22251e325',
289289

290-
'peer.active.2.ip': '127.0.0.1',
291-
'peer.active.2.port': 50006,
292-
'peer.active.2.nodeId': '8ac219dc7ac6bfe401892ddd26c63f14e7cd5b62c750162c0889eee19c1725c29e52c00bc91ee260241d2e4ddcf72ed69746b226fc7c1c63f906d19a7a31988a',
293-
294290
'peer.active.3.ip': '127.0.0.1',
295-
'peer.active.3.port': 60000,
296-
'peer.active.3.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
297-
291+
'peer.active.3.port': 50006,
292+
'peer.active.3.nodeId': '8ac219dc7ac6bfe401892ddd26c63f14e7cd5b62c750162c0889eee19c1725c29e52c00bc91ee260241d2e4ddcf72ed69746b226fc7c1c63f906d19a7a31988a',
293+
294+
'peer.active.4.ip': '127.0.0.1',
295+
'peer.active.4.port': 60000,
296+
'peer.active.4.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
297+
298298
'federator.amountOfHeadersToSend': 500,
299299
},
300300
bookkeepingConfigurations,
@@ -318,13 +318,13 @@ module.exports = {
318318
},
319319
customConfig: {
320320

321-
'peer.active.1.ip': '127.0.0.1',
322-
'peer.active.1.port': 50000,
323-
'peer.active.1.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
321+
'peer.active.0.ip': '127.0.0.1',
322+
'peer.active.0.port': 50000,
323+
'peer.active.0.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
324324

325-
'peer.active.2.ip': '127.0.0.1',
326-
'peer.active.2.port': 50004,
327-
'peer.active.2.nodeId': '328105ab6744914e61bcfcb729d741f23528fd6eb1b42628120ab027d82c9c2d8c445f8c6727e291e1abcaa8398bf47d4cca6ea6600b137b875b8df22251e325',
325+
'peer.active.1.ip': '127.0.0.1',
326+
'peer.active.1.port': 50004,
327+
'peer.active.1.nodeId': '328105ab6744914e61bcfcb729d741f23528fd6eb1b42628120ab027d82c9c2d8c445f8c6727e291e1abcaa8398bf47d4cca6ea6600b137b875b8df22251e325',
328328

329329
'peer.active.2.ip': '127.0.0.1',
330330
'peer.active.2.port': 50006,
@@ -357,9 +357,9 @@ module.exports = {
357357
'federator.signers.MST.type': 'keyFile',
358358
'federator.signers.MST.path': path.resolve(__dirname, `${keysPathResolve}/third-federation/fed3.key`),
359359

360-
'peer.active.3.ip': '127.0.0.1',
361-
'peer.active.3.port': 50000,
362-
'peer.active.3.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
360+
'peer.active.0.ip': '127.0.0.1',
361+
'peer.active.0.port': 50000,
362+
'peer.active.0.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
363363

364364
'peer.active.1.ip': '127.0.0.1',
365365
'peer.active.1.port': 50002,
@@ -392,17 +392,17 @@ module.exports = {
392392
},
393393
customConfig: {
394394

395-
'peer.active.3.ip': '127.0.0.1',
396-
'peer.active.3.port': 50000,
397-
'peer.active.3.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
395+
'peer.active.0.ip': '127.0.0.1',
396+
'peer.active.0.port': 50000,
397+
'peer.active.0.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
398398

399399
'peer.active.1.ip': '127.0.0.1',
400400
'peer.active.1.port': 50002,
401401
'peer.active.1.nodeId': '0b1d25b03d041028326ac5b27af941524c31bf09df5fece7476d3940f9cd2394d3cd349b9b265b7427607736dcee323d9e4a893b1d15549c928278a4e6012c08',
402402

403-
'peer.active.0.ip': '127.0.0.1',
404-
'peer.active.0.port': 50004,
405-
'peer.active.0.nodeId': '328105ab6744914e61bcfcb729d741f23528fd6eb1b42628120ab027d82c9c2d8c445f8c6727e291e1abcaa8398bf47d4cca6ea6600b137b875b8df22251e325',
403+
'peer.active.2.ip': '127.0.0.1',
404+
'peer.active.2.port': 50004,
405+
'peer.active.2.nodeId': '328105ab6744914e61bcfcb729d741f23528fd6eb1b42628120ab027d82c9c2d8c445f8c6727e291e1abcaa8398bf47d4cca6ea6600b137b875b8df22251e325',
406406

407407
'federator.amountOfHeadersToSend': 500,
408408
},
@@ -436,17 +436,17 @@ module.exports = {
436436
'federator.signers.MST.type': 'keyFile',
437437
'federator.signers.MST.path': path.resolve(__dirname, `${keysPathResolve}/fourth-federation/fed1.key`),
438438

439-
'peer.active.1.ip': '127.0.0.1',
440-
'peer.active.1.port': 50000,
441-
'peer.active.1.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
439+
'peer.active.0.ip': '127.0.0.1',
440+
'peer.active.0.port': 50000,
441+
'peer.active.0.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
442442

443-
'peer.active.3.ip': '127.0.0.1',
444-
'peer.active.3.port': 60002,
445-
'peer.active.3.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
443+
'peer.active.1.ip': '127.0.0.1',
444+
'peer.active.1.port': 60002,
445+
'peer.active.1.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
446446

447-
'peer.active.4.ip': '127.0.0.1',
448-
'peer.active.4.port': 60004,
449-
'peer.active.4.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
447+
'peer.active.2.ip': '127.0.0.1',
448+
'peer.active.2.port': 60004,
449+
'peer.active.2.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
450450

451451
'peer.active.3.ip': '127.0.0.1',
452452
'peer.active.3.port': 60006,
@@ -474,18 +474,18 @@ module.exports = {
474474
mst: '0x02c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020',
475475
},
476476
customConfig: {
477-
477+
478+
'peer.active.0.ip': '127.0.0.1',
479+
'peer.active.0.port': 60000,
480+
'peer.active.0.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
481+
478482
'peer.active.1.ip': '127.0.0.1',
479-
'peer.active.1.port': 60000,
480-
'peer.active.1.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
483+
'peer.active.1.port': 60004,
484+
'peer.active.1.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
481485

482486
'peer.active.2.ip': '127.0.0.1',
483-
'peer.active.2.port': 60004,
484-
'peer.active.2.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
485-
486-
'peer.active.3.ip': '127.0.0.1',
487-
'peer.active.3.port': 60006,
488-
'peer.active.3.nodeId': '0b1d25b03d041028326ac5b27af941524c31bf09df5fece7476d3940f9cd2394d3cd349b9b265b7427607736dcee323d9e4a893b1d15549c928278a4e6012c08',
487+
'peer.active.2.port': 60006,
488+
'peer.active.2.nodeId': '0b1d25b03d041028326ac5b27af941524c31bf09df5fece7476d3940f9cd2394d3cd349b9b265b7427607736dcee323d9e4a893b1d15549c928278a4e6012c08',
489489

490490
'federator.amountOfHeadersToSend': 500,
491491
},
@@ -514,17 +514,17 @@ module.exports = {
514514
'federator.signers.MST.type': 'keyFile',
515515
'federator.signers.MST.path': path.resolve(__dirname, `${keysPathResolve}/fourth-federation/fed3.key`),
516516

517-
'peer.active.3.ip': '127.0.0.1',
518-
'peer.active.3.port': 60000,
519-
'peer.active.3.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
517+
'peer.active.0.ip': '127.0.0.1',
518+
'peer.active.0.port': 60000,
519+
'peer.active.0.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
520520

521-
'peer.active.3.ip': '127.0.0.1',
522-
'peer.active.3.port': 60002,
523-
'peer.active.3.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
521+
'peer.active.1.ip': '127.0.0.1',
522+
'peer.active.1.port': 60002,
523+
'peer.active.1.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
524524

525-
'peer.active.3.ip': '127.0.0.1',
526-
'peer.active.3.port': 60006,
527-
'peer.active.3.nodeId': '0b1d25b03d041028326ac5b27af941524c31bf09df5fece7476d3940f9cd2394d3cd349b9b265b7427607736dcee323d9e4a893b1d15549c928278a4e6012c08',
525+
'peer.active.2.ip': '127.0.0.1',
526+
'peer.active.2.port': 60006,
527+
'peer.active.2.nodeId': '0b1d25b03d041028326ac5b27af941524c31bf09df5fece7476d3940f9cd2394d3cd349b9b265b7427607736dcee323d9e4a893b1d15549c928278a4e6012c08',
528528

529529
'federator.amountOfHeadersToSend': 500,
530530
},
@@ -549,17 +549,17 @@ module.exports = {
549549
},
550550
customConfig: {
551551

552-
'peer.active.3.ip': '127.0.0.1',
553-
'peer.active.3.port': 60000,
554-
'peer.active.3.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
555-
556-
'peer.active.3.ip': '127.0.0.1',
557-
'peer.active.3.port': 60002,
558-
'peer.active.3.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
552+
'peer.active.0.ip': '127.0.0.1',
553+
'peer.active.0.port': 60000,
554+
'peer.active.0.nodeId': '3ebf25b39fa357d14afd8cf2a66207e7c2eba9e0e21d96d3026f62e2451724d28e2800a5c024e62e6edad2073fc1670df7e7e7c157436c53e73bb72f1d58f88d',
559555

560556
'peer.active.1.ip': '127.0.0.1',
561-
'peer.active.1.port': 60004,
562-
'peer.active.1.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
557+
'peer.active.1.port': 60002,
558+
'peer.active.1.nodeId': 'c60bb95e83a68a68fb090eef7e2b11d463eb7496a4f93ec35874debe97068020e0b40997586fc982d7423c0f376d0ba9a5d4ed058e51822118a88fb6f1746ea6',
559+
560+
'peer.active.2.ip': '127.0.0.1',
561+
'peer.active.2.port': 60004,
562+
'peer.active.2.nodeId': '4ba6ec42eab139697c3614653e130e76fc15d1d7e5c91b3df63d3c06195d42265a5550cda65aa54de279a79a55e5513598b183e64f351e790d6370a6c67b141d',
563563

564564
'federator.amountOfHeadersToSend': 500,
565565
},

‎lib/rsk-utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ const waitForRskMempoolToGetThisCountOfThisTxType = async (rskTxHelper, txType,
212212
const method = async () => {
213213

214214
const mempoolTxs = await getRskMempoolTransactionsToTheBridge(rskTxHelper, true);
215-
const txsToBridge = mempoolTxs.filter(tx => tx.input && tx.input.startsWith(txType.methodSelector));
215+
const txsToBridge = mempoolTxs.filter(tx => typeof tx.input === 'string' && tx.input.startsWith(txType.methodSelector));
216216

217217
if(txsToBridge.length >= expectedCount) {
218218
logger.debug(`[${waitForRskMempoolToGetThisCountOfThisTxType.name}] Found ${txsToBridge.length} ${txType.name} txs in the rsk mempool, expected at least ${expectedCount}`);

0 commit comments

Comments
 (0)