lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: overrides should not merge child arrays

Browse source
This commit is contained in:
Taranto 2020-10-30 19:37:33 +00:00 • committed by Josh Harvey
parent a108df0c4c
commit 13633b06bd
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/new-config-manager.js
View file

@ -24,7 +24,7 @@ const toNamespace = (key, config) => _.mapKeys(it => `${key}_${it}`)(config)
const resolveOverrides = (original, filter, overrides, overridesPath = 'overrides') => { const resolveOverrides = (original, filter, overrides, overridesPath = 'overrides') => {
if (_.isEmpty(overrides)) return _.omit(overridesPath, original) if (_.isEmpty(overrides)) return _.omit(overridesPath, original)
return _.omit(overridesPath, _.mergeAll([original, ..._.filter(filter)(overrides)])) return _.omit(overridesPath, _.assignAll([original, ..._.filter(filter)(overrides)]))
} }
const getCommissions = (cryptoCode, deviceId, config) => { const getCommissions = (cryptoCode, deviceId, config) => {
@ -36,7 +36,7 @@ const getCommissions = (cryptoCode, deviceId, config) => {
if (_.isEmpty(overrides)) return _.omit('overrides', commissions) if (_.isEmpty(overrides)) return _.omit('overrides', commissions)
return _.omit('overrides', _.mergeAll([commissions, ..._.filter(allFilter)(overrides), ..._.filter(filter)(overrides)])) return _.omit('overrides', _.assignAll([commissions, ..._.filter(allFilter)(overrides), ..._.filter(filter)(overrides)]))
} }
const getLocale = (deviceId, it) => { const getLocale = (deviceId, it) => {