Solves new sonar complains

Author: jeremy-then

lib/federate-runner.js

@@ -1,17 +1,17 @@
 
-var childProcess = require('node:child_process');
-var devnull = require('dev-null');
-var fs = require('fs-extra');
-var tmp = require('tmp');
-var portUtils = require('./port-utils');
-var path = require('node:path');
-var find = require('find');
-var _ = require('lodash');
-let removeDir = require('./utils').removeDir;
+const childProcess = require('node:child_process');
+const devnull = require('dev-null');
+const fs = require('fs-extra');
+const tmp = require('tmp');
+const portUtils = require('./port-utils');
+const path = require('node:path');
+const find = require('find');
+const _ = require('lodash');
+const removeDir = require('./utils').removeDir;
 
 const javaCommand = process.env.JAVA_BIN_PATH ? process.env.JAVA_BIN_PATH : 'java';
 
-var DEFAULT_OPTIONS = {
+const DEFAULT_OPTIONS = {
   bitcoinPeer: 'localhost:20123',
   command: javaCommand,
   mainClass: 'co.rsk.federate.FederateRunner',
@@ -22,7 +22,7 @@ var DEFAULT_OPTIONS = {
   }
 }
 
-var FederateRunner = function(options) {
+const FederateRunner = function(options) {
   this.options = Object.assign({}, DEFAULT_OPTIONS, options);
 }
 
@@ -31,7 +31,7 @@ FederateRunner.prototype._assignPorts = function(selectedPorts) {
     rsk: this.options.port,
     rpc: this.options.rpcPort
   };
-  var portIndex = 0;
+  const portIndex = 0;
   if (!this.ports.rsk) {
     this.ports.rsk = selectedPorts[portIndex++];
   }
@@ -41,7 +41,7 @@ FederateRunner.prototype._assignPorts = function(selectedPorts) {
 };
 
 FederateRunner.prototype._setupCustomConfig = function() {
-  var customConfig = this.options.customConfig || {};
+  const customConfig = this.options.customConfig || {};
 
   if (this.options.bitcoinPeer && this.options.customConfig['federator.bitcoinPeerAddresses.0'] == null) {
     this.options.customConfig['federator.bitcoinPeerAddresses.0'] = this.options.bitcoinPeer;
@@ -60,7 +60,7 @@ FederateRunner.prototype._setupCustomConfig = function() {
 };
 
 FederateRunner.prototype._buildArguments = function(customConfig) {
-  var args = [
+  const args = [
     '-cp', this.options.classpath,
     `-Drsk.conf.file=${this.options.configFile}`
   ];
@@ -80,7 +80,7 @@ FederateRunner.prototype._buildArguments = function(customConfig) {
   }
 
   if (this.options.forks.activationHeights) {
-    var overrideMessage = [];
+    const overrideMessage = [];
     const activationHeightsKeys = Object.keys(this.options.forks.activationHeights);
     for (const key of activationHeightsKeys) {
       args.push(`-Dblockchain.config.hardforkActivationHeights.${key}=${this.options.forks.activationHeights[key]}`)
@@ -130,27 +130,27 @@ FederateRunner.prototype.start = function() {
     throw "Must specify a classpath for the Federate";
   }
   this.options.classpath = path.resolve(this.options.classpath);
-  var originalFilename = this.options.classpath;
+  const originalFilename = this.options.classpath;
 
   if (!fs.existsSync(originalFilename)) {
     throw `${originalFilename} does not exist`;
   }
 
-  var filename = fs.realpathSync(originalFilename);
+  const filename = fs.realpathSync(originalFilename);
   dir = path.dirname(filename);
 
   const runnerStdOut = this.options.runnerStdOut;
   find.file(/federate-node.+\-all\.jar$/, dir, function(files) {
     //get the files from simbolic links
-    var realFiles = _.map(files, function(file) {
-      var stats = fs.lstatSync(file);
-      var realFile = file;
+    const realFiles = _.map(files, function(file) {
+      const stats = fs.lstatSync(file);
+      let realFile = file;
       if(stats.isSymbolicLink()){
         realFile = fs.readlinkSync(file);
       }
       return realFile;
     });
-    var maxFileName = _.max(realFiles);
+    const maxFileName = _.max(realFiles);
     if(maxFileName != null && path.basename(maxFileName) !== path.basename(filename)) {
       runnerStdOut.write("WARNING Federate classpath uses " + path.basename(filename) + " but there is a newer version: " + path.basename(maxFileName) + "\n");
     }
@@ -161,13 +161,13 @@ FederateRunner.prototype.start = function() {
   }
   this.options.configFile = path.resolve(this.options.configFile);
 
-  var portsNeeded = (!this.options.port ? 1 : 0) + (!this.options.rpcPort ? 1 : 0);
-  var futurePorts = portsNeeded === 0 ? Promise.resolve([]) : portUtils.findFreePort(20000, 20100, '127.0.0.1', portsNeeded);
+  const portsNeeded = (!this.options.port ? 1 : 0) + (!this.options.rpcPort ? 1 : 0);
+  const futurePorts = portsNeeded === 0 ? Promise.resolve([]) : portUtils.findFreePort(20000, 20100, '127.0.0.1', portsNeeded);
 
   return futurePorts.then((selectedPorts) => {
     this._assignPorts(selectedPorts);
-    var customConfig = this._setupCustomConfig();
-    var args = this._buildArguments(customConfig);
+    const customConfig = this._setupCustomConfig();
+    const args = this._buildArguments(customConfig);
     this._setupProcess(args);
 
     runnerStdOut.write(` starting!\n`);

lib/rsk-utils.js

@@ -25,8 +25,7 @@ let secp;
 
 // NOSONAR: Top-level await is not supported in CommonJS modules (this file uses require()). 
 // Using promise chain to initialize secp module. The module is loaded asynchronously before functions that use it are called.
-// NOSONAR
-import('@noble/secp256k1').then(secpModule => {
+import('@noble/secp256k1').then(secpModule => { // NOSONAR S-6036
   secp = secpModule;
 });