Merge pull request #3655 from LiskHQ/3642-Commander_failed_to_install…

…_lisk_core Commander failed to install lisk core - Closes #3642
LiskHQ · May 17, 2019 · f6b4212 · f6b4212
2 parents e2596c7 + ca995e3
commit f6b4212
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/commander/src/utils/core/cache.ts b/commander/src/utils/core/cache.ts
@@ -66,10 +66,8 @@ const stopCommand = async (
 ): Promise<string> => {
 	try {
 		const {
-			config: {
-				components: {
-					cache: { password },
-				},
+			components: {
+				cache: { password },
 			},
 		}: LiskConfig = await getLiskConfig(installDir, network);
 		const { redisPort } = await describeApplication(name);
@@ -109,10 +107,8 @@ export const isCacheEnabled = async (
 ): Promise<boolean> => {
 	try {
 		const {
-			config: {
-				components: {
-					cache: { enabled },
-				},
+			components: {
+				cache: { enabled },
 			},
 		}: LiskConfig = await getLiskConfig(installDir, network);
 

diff --git a/commander/src/utils/core/config.ts b/commander/src/utils/core/config.ts
@@ -40,13 +40,10 @@ interface ComponentsConfig {
 	readonly cache: CacheConfig;
 }
 
-interface Config {
+export interface LiskConfig {
 	readonly app: AppConfig;
 	readonly components: ComponentsConfig;
 }
-export interface LiskConfig {
-	readonly config: Config;
-}
 
 export const defaultLiskPath = path.join(os.homedir(), '.lisk');
 export const defaultLiskPm2Path = `${defaultLiskPath}/pm2`;

diff --git a/commander/src/utils/core/database.ts b/commander/src/utils/core/database.ts
@@ -97,10 +97,8 @@ export const createUser = async (
 ): Promise<string> => {
 	try {
 		const {
-			config: {
-				components: {
-					storage: { user, password },
-				},
+			components: {
+				storage: { user, password },
 			},
 		}: LiskConfig = await getLiskConfig(installDir, network);
 		const { dbPort } = await describeApplication(name);
@@ -129,10 +127,8 @@ export const createDatabase = async (
 ): Promise<string> => {
 	try {
 		const {
-			config: {
-				components: {
-					storage: { database },
-				},
+			components: {
+				storage: { database },
 			},
 		}: LiskConfig = await getLiskConfig(installDir, network);
 		const { dbPort } = await describeApplication(name);
@@ -184,10 +180,8 @@ export const restoreSnapshot = async (
 ): Promise<string> => {
 	try {
 		const {
-			config: {
-				components: {
-					storage: { database, user },
-				},
+			components: {
+				storage: { database, user },
 			},
 		}: LiskConfig = await getLiskConfig(installDir, network);
 		const { dbPort } = await describeApplication(name);