Skip to content

Commit

Permalink
Merge pull request #48 from simocsdk/fix-configFileImport
Browse files Browse the repository at this point in the history
fix config file import when cosmos-directory is a submodule
  • Loading branch information
tombeynon committed Nov 1, 2022
2 parents a58c082 + dd3c2e8 commit 7e173b3
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions chains/chainRegistry.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import fs from 'fs'
import _ from 'lodash'
import Chain from './chain.js'
import * as Path from 'path';
import { fileURLToPath } from 'url';

const __filename = fileURLToPath(import.meta.url);
const __dirname = Path.dirname(__filename);

function ChainRegistry(client) {
async function repository() {
Expand Down Expand Up @@ -33,14 +38,17 @@ function ChainRegistry(client) {
return Chain(client, data, params, config)
}

function getConfig(path){
function getConfig(path) {
const systemConfigFilePath = "../config.json"
const localConfigFilePath = "../config/config.local.json"

try {
const systemConfigFile = fs.readFileSync('config.json');
const systemConfigFile = fs.readFileSync(Path.join(__dirname, systemConfigFilePath));
const systemConfig = systemConfigFile && JSON.parse(systemConfigFile) || {}
let localConfigFile
try {
localConfigFile = fs.readFileSync('config/config.local.json');
} catch {}
localConfigFile = fs.readFileSync(Path.join(__dirname, localConfigFilePath));
} catch { }
const localConfig = localConfigFile && JSON.parse(localConfigFile) || {}
const config = _.mergeWith(systemConfig, localConfig, (a, b) =>
_.isArray(b) ? b : undefined
Expand Down

0 comments on commit 7e173b3

Please sign in to comment.