Merge pull request #245 from zelcash/development

v1.13.1

README.md

@@ -53,7 +53,7 @@ This application is open source and distributed under the GNU AGPLv3 licence
 
 ## Start Flux
 
-Flux needs Daemon to be ruuning, to setup Daemon follow [these instructions.](https://github.com/zelcash/ZelNodeInstallv3)
+Flux needs Daemon to be running, to setup Daemon follow [these instructions.](https://github.com/zelcash/ZelNodeInstallv3)
 
 build-essential is a recommended dependency
 

ZelBack/src/services/appsService.js

@@ -1248,7 +1248,7 @@ async function createAppVolume(appSpecifications, res) {
     global.allocationInterval = setInterval(() => {
       iterationAlloc += 1;
       const allocateSpaceB = {
-        status: `Space alocation is running for ${20 * iterationAlloc}s. This may take quite some time...`,
+        status: `Space allocation is running for ${20 * iterationAlloc}s. This may take quite some time...`,
       };
       log.info(allocateSpaceB);
       if (res) {
@@ -1334,7 +1334,7 @@ async function createAppVolume(appSpecifications, res) {
     global.verificationInterval = setInterval(() => {
       interationVerif += 1;
       const spaceVerifB = {
-        status: `Space verification is ruuning for ${20 * interationVerif}s. This may take quite some time...`,
+        status: `Space verification is running for ${20 * interationVerif}s. This may take quite some time...`,
       };
       log.info(spaceVerifB);
       if (res) {

ZelBack/src/services/benchmarkService.js

@@ -1,26 +1,36 @@
 const benchmarkrpc = require('daemonrpc');
 const config = require('config');
+const path = require('path');
+const fs = require('fs');
 const serviceHelper = require('./serviceHelper');
 const userconfig = require('../../../config/userconfig');
 
 const isTestnet = userconfig.initial.testnet;
-const rpcuser = 'zelbenchuser';
-const rpcpassword = 'zelbenchpassword';
+
 const rpcport = isTestnet === true ? config.benchmark.rpcporttestnet : config.benchmark.rpcport;
 
-const client = new benchmarkrpc.Client({
-  port: rpcport,
-  user: rpcuser,
-  pass: rpcpassword,
-  timeout: 60000,
-});
+const homeDirPath = path.join(__dirname, '../../../../');
+const newBenchmarkPath = path.join(homeDirPath, '.fluxbenchmark');
 
 let response = serviceHelper.createErrorMessage();
 
 async function executeCall(rpc, params) {
   let callResponse;
   const rpcparameters = params || [];
   try {
+    let rpcuser = 'zelbenchuser';
+    let rpcpassword = 'zelbenchpassword';
+    if (fs.existsSync(newBenchmarkPath)) {
+      rpcuser = 'fluxbenchuser';
+      rpcpassword = 'fluxbenchpassword';
+    }
+
+    const client = new benchmarkrpc.Client({
+      port: rpcport,
+      user: rpcuser,
+      pass: rpcpassword,
+      timeout: 60000,
+    });
     const data = await client[rpc](...rpcparameters);
     const successResponse = serviceHelper.createDataMessage(data);
     callResponse = successResponse;

ZelBack/src/services/fluxService.js

@@ -280,7 +280,7 @@ async function benchmarkDebug(req, res) {
     return res.json(errMessage);
   }
   const homeDirPath = path.join(__dirname, '../../../../');
-  const newBenchmarkPath = path.join(homeDirPath, '.benchmark');
+  const newBenchmarkPath = path.join(homeDirPath, '.fluxbenchmark');
   let datadir = `${homeDirPath}.zelbenchmark`;
   if (fs.existsSync(newBenchmarkPath)) {
     datadir = newBenchmarkPath;
@@ -316,7 +316,7 @@ async function tailBenchmarkDebug(req, res) {
   const authorized = await serviceHelper.verifyAdminAndFluxTeamSession(req.headers);
   if (authorized === true) {
     const homeDirPath = path.join(__dirname, '../../../../');
-    const newBenchmarkPath = path.join(homeDirPath, '.benchmark');
+    const newBenchmarkPath = path.join(homeDirPath, '.fluxbenchmark');
     let datadir = `${homeDirPath}.zelbenchmark`;
     if (fs.existsSync(newBenchmarkPath)) {
       datadir = newBenchmarkPath;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flux",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Flux, Your Gateway to a Decentralized World",
   "repository": {
     "type": "git",