Update usage reference of validator with parser

LiskHQ · Apr 9, 2019 · c14a2c7 · c14a2c7
1 parent 3108d9b
commit c14a2c7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/framework/src/components/cache/index.js b/framework/src/components/cache/index.js
@@ -36,7 +36,7 @@ const { config: defaultConfig } = require('./defaults');
 const validator = require('../../controller/helpers/validator');
 
 function createCacheComponent(options, logger) {
-	const optionsWithDefaults = validator.validateWithDefaults(
+	const optionsWithDefaults = validator.parseEnvArgAndValidate(
 		defaultConfig,
 		options
 	);

diff --git a/framework/src/components/logger/index.js b/framework/src/components/logger/index.js
@@ -19,7 +19,7 @@ const { config: defaultConfig } = require('./defaults');
 const validator = require('../../controller/helpers/validator');
 
 function createLoggerComponent(options = {}) {
-	const optionsWithDefaults = validator.validateWithDefaults(
+	const optionsWithDefaults = validator.parseEnvArgAndValidate(
 		defaultConfig,
 		options
 	);

diff --git a/framework/src/components/storage/index.js b/framework/src/components/storage/index.js
@@ -34,7 +34,7 @@ if (process.env.NEW_RELIC_LICENSE_KEY) {
 }
 
 function createStorageComponent(options, logger) {
-	options = validator.validateWithDefaults(defaultConfig, options);
+	options = validator.parseEnvArgAndValidate(defaultConfig, options);
 
 	const storage = new Storage(options, logger);
 

diff --git a/framework/src/controller/application.js b/framework/src/controller/application.js
@@ -122,7 +122,7 @@ class Application {
 		validator.loadSchema(constantsSchema);
 		validator.validate(applicationSchema.appLabel, appLabel);
 		validator.validate(applicationSchema.config, appConfig);
-		constants = validator.validateWithDefaults(
+		constants = validator.parseEnvArgAndValidate(
 			constantsSchema.constants,
 			constants
 		);
@@ -332,7 +332,7 @@ class Application {
 
 		Object.keys(modules).forEach(alias => {
 			this.logger.info(`Validating module options with alias: ${alias}`);
-			this.config.modules[alias] = validator.validateWithDefaults(
+			this.config.modules[alias] = validator.parseEnvArgAndValidate(
 				modules[alias].defaults,
 				this.config.modules[alias]
 			);

diff --git a/framework/src/modules/chain/workers_controller.js b/framework/src/modules/chain/workers_controller.js
@@ -38,7 +38,7 @@ const {
 const validator = require('../../controller/helpers/validator');
 const schema = require('./defaults/config');
 
-const config = validator.validateWithDefaults(schema, {});
+const config = validator.parseEnvArgAndValidate(schema, {});
 
 /**
  * Instantiate the SocketCluster SCWorker instance with custom logic

diff --git a/framework/test/jest/specs/unit/controller/application.spec.js b/framework/test/jest/specs/unit/controller/application.spec.js
@@ -96,7 +96,7 @@ describe('Application', () => {
 				params.label
 			);
 
-			expect(validator.validateWithDefaults).toHaveBeenCalledWith(
+			expect(validator.parseEnvArgAndValidate).toHaveBeenCalledWith(
 				constantsSchema.constants,
 				params.constants
 			);

diff --git a/framework/test/mocha/setup.js b/framework/test/mocha/setup.js
@@ -53,21 +53,21 @@ const config = {
 	protocolVersion:
 		process.env.PROTOCOL_VERSION || packageJson.lisk.protocolVersion,
 };
-config.constants = validator.validateWithDefaults(
+config.constants = validator.parseEnvArgAndValidate(
 	constantsSchema.constants,
 	constants
 );
 
 // TODO: This should be removed after https://github.com/LiskHQ/lisk/pull/2980
 global.constants = config.constants;
 
-config.genesisBlock = validator.validateWithDefaults(
+config.genesisBlock = validator.parseEnvArgAndValidate(
 	applicationSchema.genesisBlock,
 	genesisBlock
 );
 config.nethash = config.genesisBlock.payloadHash;
 
-config.modules.chain = validator.validateWithDefaults(
+config.modules.chain = validator.parseEnvArgAndValidate(
 	chainModuleSchema,
 	Object.assign({}, config.modules.chain, { exceptions })
 );
@@ -80,7 +80,7 @@ config.modules.chain = {
 	protocolVersion: config.protocolVersion,
 };
 
-config.modules.http_api = validator.validateWithDefaults(
+config.modules.http_api = validator.parseEnvArgAndValidate(
 	apiModuleSchema,
 	config.modules.http_api
 );
@@ -92,11 +92,11 @@ config.modules.http_api = {
 	minVersion: config.minVersion,
 };
 
-config.components.storage = validator.validateWithDefaults(
+config.components.storage = validator.parseEnvArgAndValidate(
 	defaultStorageConfig,
 	config.components.storage || {}
 );
-config.components.cache = validator.validateWithDefaults(
+config.components.cache = validator.parseEnvArgAndValidate(
 	defaultCacheConfig,
 	config.components.cache || {}
 );

diff --git a/src/index.js b/src/index.js
@@ -38,7 +38,7 @@ const appSchema = {
 };
 
 try {
-	const { NETWORK, CUSTOM_CONFIG_FILE } = validator.validateWithDefaults(
+	const { NETWORK, CUSTOM_CONFIG_FILE } = validator.parseEnvArgAndValidate(
 		appSchema,
 		{}
 	);