From 3b35743bb5edd54516bb9cba2dfb9eab624e62a1 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Sun, 11 Mar 2018 14:08:15 +0000 Subject: [PATCH] fix undefined crypto scope --- lib/config-validate.js | 4 ---- lib/settings-loader.js | 13 ++++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/config-validate.js b/lib/config-validate.js index c0b6fc6a..e20151ae 100644 --- a/lib/config-validate.js +++ b/lib/config-validate.js @@ -55,10 +55,6 @@ function satisfiesRequire (config, cryptos, machineList, field, anyFields, allFi const isValid = isRequired ? !isBlank : true - if (!isValid) { - pp('DEBUG103')({fieldCode, isBlank, isRequired}) - } - return isValid }) } diff --git a/lib/settings-loader.js b/lib/settings-loader.js index 1d0b99b1..a0718a96 100644 --- a/lib/settings-loader.js +++ b/lib/settings-loader.js @@ -197,6 +197,8 @@ function cryptoCodeDefaults (schema, cryptoCode) { const hasCryptoSpecificDefault = r => r.cryptoScope === 'specific' && !_.isNil(r.default) const cryptoSpecificFields = _.filter(hasCryptoSpecificDefault, schemaEntries) + pp('DEBUG202')({scope, cryptoCode}) + return _.map(r => { const defaultValue = cryptoDefaultOverride(cryptoCode, r.code, r.default) @@ -204,14 +206,19 @@ function cryptoCodeDefaults (schema, cryptoCode) { }, cryptoSpecificFields) } +const uniqCompact = _.flow(_.compact, _.uniq) + +const pp = require('./pp') function addCryptoDefaults (oldConfig, newFields) { const cryptoCodeEntries = _.filter(v => v.fieldLocator.code === 'cryptoCurrencies', newFields) - const cryptoCodes = _.map(_.get('fieldValue.value'), cryptoCodeEntries) - const uniqueCryptoCodes = _.uniq(_.flatten(cryptoCodes)) + const cryptoCodes = _.flatMap(_.get('fieldValue.value'), cryptoCodeEntries) + const uniqueCryptoCodes = uniqCompact(cryptoCodes) const mapDefaults = cryptoCode => cryptoCodeDefaults(schema, cryptoCode) - const defaults = _.flatten(_.map(mapDefaults, uniqueCryptoCodes)) + const defaults = _.flatMap(mapDefaults, uniqueCryptoCodes) + pp('DEBUG201')({cryptoCodeEntries, cryptoCodes, uniqueCryptoCodes}) + pp('DEBUG200')(defaults) return mergeValues(defaults, oldConfig) }