From c291ec3c0e3cc2b05b47f176d93866af7792a837 Mon Sep 17 00:00:00 2001
From: Keith <keithwhisper@gmail.com>
Date: Wed, 22 May 2019 10:51:02 +0800
Subject: [PATCH] refactor(neuron-wallet): refactor main.ts and typeorm.ts

---
 packages/neuron-wallet/src/main.ts    |  3 ++-
 packages/neuron-wallet/src/typeorm.ts | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/neuron-wallet/src/main.ts b/packages/neuron-wallet/src/main.ts
index c067894398..8a2cea7a8d 100644
--- a/packages/neuron-wallet/src/main.ts
+++ b/packages/neuron-wallet/src/main.ts
@@ -3,9 +3,10 @@ import 'reflect-metadata'
 
 import initApp from './startup/initApp'
 import createWindow from './startup/createWindow'
+import createLoopTask from './startup/loopTask/create'
+
 import i18n from './utils/i18n'
 import mainmenu from './utils/mainmenu'
-import createLoopTask from './startup/loopTask/create'
 
 let mainWindow: Electron.BrowserWindow | null
 
diff --git a/packages/neuron-wallet/src/typeorm.ts b/packages/neuron-wallet/src/typeorm.ts
index 984324d9bd..4897ed3740 100644
--- a/packages/neuron-wallet/src/typeorm.ts
+++ b/packages/neuron-wallet/src/typeorm.ts
@@ -1,12 +1,15 @@
 import { createConnection, getConnectionOptions, getConnection } from 'typeorm'
-import * as path from 'path'
-import env from './env'
+import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'
+import path from 'path'
 
 import Transaction from './entities/Transaction'
 import Input from './entities/Input'
 import Output from './entities/Output'
 import SyncInfo from './entities/SyncInfo'
 
+import logger from './utils/logger'
+import env from './env'
+
 import { InitMigration1558328532490 } from './migration/1558328532490-InitMigration'
 
 const dbPath = (networkName: string): string => {
@@ -14,30 +17,31 @@ const dbPath = (networkName: string): string => {
   return path.join(env.fileBasePath, 'cells', name)
 }
 
-const connectOptions = async (networkName: string) => {
+const connectOptions = async (networkName: string): Promise<SqliteConnectionOptions> => {
   const connectionOptions = await getConnectionOptions()
-  Object.assign(connectionOptions, {
+
+  return {
+    ...connectionOptions,
+    type: 'sqlite',
     database: dbPath(networkName),
     entities: [Transaction, Input, Output, SyncInfo],
     migrations: [InitMigration1558328532490],
-  })
-
-  return connectionOptions
+  }
 }
 
 export const initConnection = async (networkName: string) => {
   // try to close connection, if not exist, will throw ConnectionNotFoundError when call getConnection()
   try {
     await getConnection().close()
-  } catch (e) {
-    // console.error(e)
+  } catch (err) {
+    logger.log({ level: 'error', message: err.message })
   }
   const connectionOptions = await connectOptions(networkName)
 
   try {
     await createConnection(connectionOptions)
-  } catch (e) {
-    console.error(e)
+  } catch (err) {
+    logger.log({ level: 'error', message: err.message })
   }
 }