From 670ea1b1d92eb7bc289de47d5a23be5cc37431e2 Mon Sep 17 00:00:00 2001
From: Dimitri Sabadie <dimitri.sabadie@ledger.fr>
Date: Fri, 1 Feb 2019 15:17:29 +0100
Subject: [PATCH] =?UTF-8?q?Use=20the=20freshResetAll=20libcore=E2=80=99s?=
 =?UTF-8?q?=20function=20when=20resetting=20the=20app.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, bump libcore’s version to 2.5.0 (release-candidate).
---
 package.json         |  2 +-
 src/helpers/reset.js | 17 +++++------------
 yarn.lock            |  8 ++++----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5a256f90..cd1acc86 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@ledgerhq/hw-app-xrp": "^4.35.0",
     "@ledgerhq/hw-transport": "^4.35.0",
     "@ledgerhq/hw-transport-node-hid": "^4.35.0",
-    "@ledgerhq/ledger-core": "2.0.0-rc.16",
+    "@ledgerhq/ledger-core": "2.0.0-rc.19",
     "@ledgerhq/live-common": "4.16.1",
     "animated": "^0.2.2",
     "async": "^2.6.1",
diff --git a/src/helpers/reset.js b/src/helpers/reset.js
index 28439120..a8103a6b 100644
--- a/src/helpers/reset.js
+++ b/src/helpers/reset.js
@@ -1,23 +1,16 @@
 // @flow
 
-import fs from 'fs'
 import { shell, remote } from 'electron'
-import path from 'path'
-import rimraf from 'rimraf'
 import resolveUserDataDirectory from 'helpers/resolveUserDataDirectory'
 import { disable as disableDBMiddleware } from 'middlewares/db'
 import db from 'helpers/db'
 import { delay } from 'helpers/promise'
 import killInternalProcess from 'commands/killInternalProcess'
-import { DBNotReset } from '@ledgerhq/errors'
+import withLibcore from 'helpers/withLibcore'
 
-async function resetLibcoreDatabase() {
+async function resetLibcore() {
   await killInternalProcess.send().toPromise()
-  const dbpath = path.resolve(resolveUserDataDirectory(), 'sqlite/')
-  rimraf.sync(dbpath, { glob: false })
-  if (fs.existsSync(dbpath)) {
-    throw new DBNotReset()
-  }
+  withLibcore(core => core.freshResetAll())
 }
 
 function reload() {
@@ -30,7 +23,7 @@ export async function hardReset() {
   disableDBMiddleware()
   db.resetAll()
   await delay(500)
-  await resetLibcoreDatabase()
+  await resetLibcore()
   reload()
 }
 
@@ -38,7 +31,7 @@ export async function softReset({ cleanAccountsCache }: *) {
   cleanAccountsCache()
   await delay(500)
   await db.cleanCache()
-  await resetLibcoreDatabase()
+  await resetLibcore()
   reload()
 }
 
diff --git a/yarn.lock b/yarn.lock
index 3ed0695a..8040cfb1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1722,10 +1722,10 @@
   dependencies:
     events "^3.0.0"
 
-"@ledgerhq/ledger-core@2.0.0-rc.16":
-  version "2.0.0-rc.16"
-  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.16.tgz#51f141c0143edb020e38855bf2e2619e3446e74f"
-  integrity sha512-gmbeXRBg4NSqzH6+EajYTzaQlwN5ugaN1nH0SI6BvRqMfcorxNRE8byfh3F2u+7TNchBW72vOZnKPDShaR9/pQ==
+"@ledgerhq/ledger-core@2.0.0-rc.19":
+  version "2.0.0-rc.19"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.19.tgz#f8cd0bdc4e8f067bd95aced895d3e1190bb63f06"
+  integrity sha512-pkSVOFNGYYiujJFCJ7JkQrwK5YMVx6MoyXBD4jA+SKthlZ8zo3X3jfhRJdZ1rUiI87GP/ncdh0Kc+epuWTqlDQ==
   dependencies:
     bindings "^1.3.0"
     nan "^2.6.2"