From bcdd19cbb7af89e9d9e89378ce553315d27e85e7 Mon Sep 17 00:00:00 2001
From: Sameer Kumar Subudhi <sameer.subudhi@lightcurve.io>
Date: Wed, 1 Nov 2023 10:03:52 +0100
Subject: [PATCH] :hammer: Move 'config' directory into 'src' directory

---
 {config => src/constants/config}/mainnet/config.json |  0
 {config => src/constants/config}/testnet/config.json |  0
 src/utils/config.ts                                  |  2 +-
 src/utils/node.ts                                    |  6 +++---
 test/unit/utils/config.spec.ts                       |  4 +++-
 test/unit/utils/node.spec.ts                         | 12 ++++++++++--
 6 files changed, 17 insertions(+), 7 deletions(-)
 rename {config => src/constants/config}/mainnet/config.json (100%)
 rename {config => src/constants/config}/testnet/config.json (100%)

diff --git a/config/mainnet/config.json b/src/constants/config/mainnet/config.json
similarity index 100%
rename from config/mainnet/config.json
rename to src/constants/config/mainnet/config.json
diff --git a/config/testnet/config.json b/src/constants/config/testnet/config.json
similarity index 100%
rename from config/testnet/config.json
rename to src/constants/config/testnet/config.json
diff --git a/src/utils/config.ts b/src/utils/config.ts
index a2a4bba3..284a0172 100644
--- a/src/utils/config.ts
+++ b/src/utils/config.ts
@@ -94,7 +94,7 @@ export const getConfig = async (
 
 export const resolveConfigPathByNetworkID = async (networkIdentifier: string): Promise<string> => {
 	const network = NETWORK_CONSTANT[networkIdentifier].name;
-	const configFilePath = join(__dirname, '../..', `config/${network}/config.json`);
+	const configFilePath = join(__dirname, '..', `constants/config/${network}/config.json`);
 	return configFilePath;
 };
 
diff --git a/src/utils/node.ts b/src/utils/node.ts
index 533ad19b..74380c15 100644
--- a/src/utils/node.ts
+++ b/src/utils/node.ts
@@ -100,8 +100,8 @@ const copyLegacyDB = async (_this: Command) => {
 
 export const getFinalConfigPath = async (outputDir: string, network: string) =>
 	(await exists(`${outputDir}/config.json`))
-		? outputDir
-		: path.resolve(__dirname, '../..', 'config', network);
+		? path.resolve(outputDir, 'config.json')
+		: path.resolve(__dirname, '..', 'constants/config', network, 'config.json');
 
 export const validateStartCommandFlags = async (
 	allowedFlags: string[],
@@ -149,7 +149,7 @@ const resolveLiskCoreStartCommand = async (_this: Command, network: string, conf
 	const baseStartCommand = `lisk-core start --network ${network}`;
 
 	if (!isUserConfirmed) {
-		const defaultStartCommand = `${baseStartCommand} --config ${configPath}/config.json`;
+		const defaultStartCommand = `${baseStartCommand} --config ${configPath}`;
 		liskCoreStartCommand = defaultStartCommand;
 		return defaultStartCommand;
 	}
diff --git a/test/unit/utils/config.spec.ts b/test/unit/utils/config.spec.ts
index 36c6fe0a..02ab25d0 100644
--- a/test/unit/utils/config.spec.ts
+++ b/test/unit/utils/config.spec.ts
@@ -86,7 +86,9 @@ describe('Test networkIdentifier method', () => {
 
 describe('Test resolveConfigPathByNetworkID method', () => {
 	it('should resolve config filePath when called by valid networkID', async () => {
-		const expectedConfigPath = resolve(`${__dirname}../../../../config/testnet/config.json`);
+		const expectedConfigPath = resolve(
+			`${__dirname}../../../../src/constants/config/testnet/config.json`,
+		);
 		const networkID = '15f0dacc1060e91818224a94286b13aa04279c640bd5d6f193182031d133df7c';
 		const configPath = await resolveConfigPathByNetworkID(networkID);
 		expect(configPath).toBe(expectedConfigPath);
diff --git a/test/unit/utils/node.spec.ts b/test/unit/utils/node.spec.ts
index 0df150ff..0b2fc6fa 100644
--- a/test/unit/utils/node.spec.ts
+++ b/test/unit/utils/node.spec.ts
@@ -143,7 +143,11 @@ describe('Test getFinalConfigPath method', () => {
 		const outputDir = join(__dirname, '../../..', 'test/unit/fixtures/outputDir');
 		const configPath = await getFinalConfigPath(outputDir, network);
 
-		const expectedResponse = join(__dirname, '../../..', 'config/mainnet');
+		const expectedResponse = join(
+			__dirname,
+			'../../..',
+			'src/constants/config/mainnet/config.json',
+		);
 		expect(configPath).toBe(expectedResponse);
 	});
 
@@ -151,7 +155,11 @@ describe('Test getFinalConfigPath method', () => {
 		const outputDir = join(__dirname, '../../..', 'config');
 		const configPath = await getFinalConfigPath(outputDir, network);
 
-		const expectedResponse = join(__dirname, '../../..', 'config/mainnet');
+		const expectedResponse = join(
+			__dirname,
+			'../../..',
+			'src/constants/config/mainnet/config.json',
+		);
 		expect(configPath).toBe(expectedResponse);
 	});
 });