Merge pull request #1502 from OriginTrail/hotfix/support-mariner-nodes

Fix config reading for nodes with "mariner" node_env
OriginTrail · Mar 23, 2021 · 3017411 · 3017411
2 parents 2f60f47 + 0fa5521
commit 3017411
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 13 deletions.
diff --git a/migrations/202010201032128-update-events-add-blockchain-id.js b/migrations/202010201032128-update-events-add-blockchain-id.js
@@ -5,7 +5,11 @@ if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = 'testnet';
 }
 
-const environmentConfig = global_config[process.env.NODE_ENV];
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202011261221123-update-offers-add-blockchain-id.js b/migrations/202011261221123-update-offers-add-blockchain-id.js
@@ -5,7 +5,11 @@ if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = 'testnet';
 }
 
-const environmentConfig = global_config[process.env.NODE_ENV];
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202011261243123-update-bids-add-blockchain-id.js b/migrations/202011261243123-update-bids-add-blockchain-id.js
@@ -5,7 +5,11 @@ if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = 'testnet';
 }
 
-const environmentConfig = global_config[process.env.NODE_ENV];
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202011261416123-update-data-info-extend-data-provider-wallet.js b/migrations/202011261416123-update-data-info-extend-data-provider-wallet.js
@@ -5,7 +5,11 @@ if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = 'testnet';
 }
 
-const environmentConfig = global_config[process.env.NODE_ENV];
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202011301208123-update-data-sellers-add-blockchain-id.js b/migrations/202011301208123-update-data-sellers-add-blockchain-id.js
@@ -4,7 +4,12 @@ if (!process.env.NODE_ENV) {
     // Environment not set. Use the production.
     process.env.NODE_ENV = 'testnet';
 }
-const environmentConfig = global_config[process.env.NODE_ENV];
+
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202011301210123-update-data-trades-add-blockchain-id.js b/migrations/202011301210123-update-data-trades-add-blockchain-id.js
@@ -4,7 +4,12 @@ if (!process.env.NODE_ENV) {
     // Environment not set. Use the production.
     process.env.NODE_ENV = 'testnet';
 }
-const environmentConfig = global_config[process.env.NODE_ENV];
+
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202012090818123-update-purchased-data-add-blockchain-id.js b/migrations/202012090818123-update-purchased-data-add-blockchain-id.js
@@ -4,7 +4,12 @@ if (!process.env.NODE_ENV) {
     // Environment not set. Use the production.
     process.env.NODE_ENV = 'testnet';
 }
-const environmentConfig = global_config[process.env.NODE_ENV];
+
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202012151048123-update-challenges-add-blockchain-id.js b/migrations/202012151048123-update-challenges-add-blockchain-id.js
@@ -4,7 +4,12 @@ if (!process.env.NODE_ENV) {
     // Environment not set. Use the production.
     process.env.NODE_ENV = 'testnet';
 }
-const environmentConfig = global_config[process.env.NODE_ENV];
+
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/migrations/202102120853043-update-commands-add-blockchain-id.js b/migrations/202102120853043-update-commands-add-blockchain-id.js
@@ -4,7 +4,12 @@ if (!process.env.NODE_ENV) {
     // Environment not set. Use the production.
     process.env.NODE_ENV = 'testnet';
 }
-const environmentConfig = global_config[process.env.NODE_ENV];
+
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const environmentConfig = global_config[environment];
 const blockchain_id = environmentConfig.blockchain.implementations[0].network_id;
 
 module.exports = {

diff --git a/modules/ImportUtilities.js b/modules/ImportUtilities.js
@@ -13,7 +13,15 @@ const OtJsonUtilities = require('./OtJsonUtilities');
 const DataIntegrityResolver = require('./service/data-integrity/data-integrity-resolver');
 // TODO Is this safe to read, IE will it always be the same,
 //  (could the node somehow change this in runtime? )
-const defaultConfig = require('../config/config')[process.env.NODE_ENV];
+if (!process.env.NODE_ENV) {
+    // Environment not set. Use the production.
+    process.env.NODE_ENV = 'testnet';
+}
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const defaultConfig = require('../config/config')[environment];
 
 const data_constants = {
     vertexType: {

diff --git a/modules/OtJsonUtilities.js b/modules/OtJsonUtilities.js
@@ -1,6 +1,15 @@
 const Utilities = require('./Utilities');
 const { sha3_256 } = require('js-sha3');
-const defaultConfig = require('../config/config')[process.env.NODE_ENV];
+
+if (!process.env.NODE_ENV) {
+    // Environment not set. Use the production.
+    process.env.NODE_ENV = 'testnet';
+}
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const defaultConfig = require('../config/config')[environment];
 
 
 class OtJsonUtilities {

diff --git a/modules/logger.js b/modules/logger.js
@@ -5,7 +5,15 @@ require('winston-papertrail').Papertrail;
 require('winston-loggly-bulk');
 const util = require('util');
 
-const runtimeConfigJson = require('../config/config.json')[process.env.NODE_ENV];
+if (!process.env.NODE_ENV) {
+    // Environment not set. Use the production.
+    process.env.NODE_ENV = 'testnet';
+}
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const runtimeConfigJson = require('../config/config.json')[environment];
 
 const colors = require('colors/safe');
 const pjson = require('../package.json');

diff --git a/modules/worker/export-worker.js b/modules/worker/export-worker.js
@@ -5,7 +5,16 @@ const Utilities = require('../Utilities');
 const ImportUtilities = require('../ImportUtilities');
 const OtJsonUtilities = require('../OtJsonUtilities');
 const fs = require('fs');
-const defaultConfig = require('../../config/config')[process.env.NODE_ENV];
+
+if (!process.env.NODE_ENV) {
+    // Environment not set. Use the production.
+    process.env.NODE_ENV = 'testnet';
+}
+const environment = process.env.NODE_ENV === 'mariner' ? 'mainnet' : process.env.NODE_ENV;
+if (['mainnet', 'testnet', 'development'].indexOf(environment) < 0) {
+    throw Error(`Unsupported node environment ${environment}`);
+}
+const defaultConfig = require('../../config/config')[environment];
 
 process.on('message', async (data) => {
     const {