Integrate file into wallet action

Author: tanx

src/action/wallet.js

@@ -14,13 +14,13 @@ import { when } from 'mobx';
 import * as log from './log';
 
 class WalletAction {
-  constructor(store, grpc, db, nav, notification, FS) {
+  constructor(store, grpc, db, nav, notification, file) {
     this._store = store;
     this._grpc = grpc;
     this._db = db;
     this._nav = nav;
     this._notification = notification;
-    this._FS = FS;
+    this._file = file;
   }
 
   //
@@ -266,7 +266,7 @@ class WalletAction {
    */
   async initWallet({ walletPassword, seedMnemonic, recoveryWindow = 0 }) {
     try {
-      await Promise.all([this.deleteDB('testnet'), this.deleteDB('mainnet')]);
+      await this.deleteDB();
       await this._grpc.sendUnlockerCommand('InitWallet', {
         walletPassword: toBuffer(walletPassword),
         cipherSeedMnemonic: seedMnemonic,
@@ -293,20 +293,19 @@ class WalletAction {
   /**
    * Delete the wallet.db file. This allows the user to restore their wallet
    * (including channel state) from the seed if they've they've forgotten the
-   * wallet pin/password.
+   * wallet pin/password. We need to delete both mainnet and testnet wallet
+   * files since we haven't set `store.network` at this point in the app life
+   * cycle yet (which happens later when we query getInfo).
    * @return {Promise<undefined>}
    */
-  async deleteDB(network) {
-    if (!this._FS) {
+  async deleteDB() {
+    if (!this._file) {
       return;
     }
-    const lndDir = this._FS.DocumentDirectoryPath;
-    const dbPath = `${lndDir}/data/chain/bitcoin/${network}/wallet.db`;
-    try {
-      await this._FS.unlink(dbPath);
-    } catch (err) {
-      log.info(`No ${network} wallet to delete.`);
-    }
+    await Promise.all([
+      this._file.deleteWalletDB('testnet'),
+      this._file.deleteWalletDB('mainnet'),
+    ]);
   }
 
   /**

test/unit/action/wallet.spec.js

@@ -4,6 +4,7 @@ import AppStorage from '../../../src/action/app-storage';
 import WalletAction from '../../../src/action/wallet';
 import NavAction from '../../../src/action/nav';
 import NavActionMobile from '../../../src/action/nav-mobile';
+import FileAction from '../../../src/action/file-mobile';
 import NotificationAction from '../../../src/action/notification';
 import * as logger from '../../../src/action/log';
 import nock from 'nock';
@@ -18,7 +19,7 @@ describe('Action Wallet Unit Tests', () => {
   let wallet;
   let nav;
   let notification;
-  let RNFS;
+  let file;
 
   beforeEach(() => {
     sandbox = sinon.createSandbox({});
@@ -31,11 +32,8 @@ describe('Action Wallet Unit Tests', () => {
     db = sinon.createStubInstance(AppStorage);
     notification = sinon.createStubInstance(NotificationAction);
     nav = sinon.createStubInstance(NavAction);
-    RNFS = {
-      DocumentDirectoryPath: '/foo/bar',
-      unlink: sinon.stub(),
-    };
-    wallet = new WalletAction(store, grpc, db, nav, notification, RNFS);
+    file = sinon.createStubInstance(FileAction);
+    wallet = new WalletAction(store, grpc, db, nav, notification, file);
   });
 
   afterEach(() => {
@@ -308,18 +306,9 @@ describe('Action Wallet Unit Tests', () => {
   describe('initWallet()', () => {
     it('should init wallet', async () => {
       grpc.sendUnlockerCommand.withArgs('InitWallet').resolves();
-      RNFS.unlink.resolves();
       await wallet.initWallet({ walletPassword: 'baz', seedMnemonic: ['foo'] });
-      expect(
-        RNFS.unlink,
-        'was called with',
-        '/foo/bar/data/chain/bitcoin/mainnet/wallet.db'
-      );
-      expect(
-        RNFS.unlink,
-        'was called with',
-        '/foo/bar/data/chain/bitcoin/testnet/wallet.db'
-      );
+      expect(file.deleteWalletDB, 'was called with', 'mainnet');
+      expect(file.deleteWalletDB, 'was called with', 'testnet');
       expect(store.walletUnlocked, 'to be', true);
       expect(grpc.sendUnlockerCommand, 'was called with', 'InitWallet', {
         walletPassword: Buffer.from('baz', 'utf8'),
@@ -330,9 +319,9 @@ describe('Action Wallet Unit Tests', () => {
 
     it('should not delete wallet if RNFS not supported', async () => {
       grpc.sendUnlockerCommand.withArgs('InitWallet').resolves();
-      delete wallet._FS;
+      delete wallet._file;
       await wallet.initWallet({ walletPassword: 'baz', seedMnemonic: ['foo'] });
-      expect(RNFS.unlink, 'was not called');
+      expect(file.deleteWalletDB, 'was not called');
       expect(store.walletUnlocked, 'to be', true);
       expect(grpc.sendUnlockerCommand, 'was called with', 'InitWallet', {
         walletPassword: Buffer.from('baz', 'utf8'),