Browse Source

Use the freshResetAll libcore’s function when resetting the app.

Also, bump libcore’s version to 2.5.0 (release-candidate).
develop
Dimitri Sabadie 6 years ago
parent
commit
670ea1b1d9
No known key found for this signature in database GPG Key ID: F322275DCA0B21DF
  1. 2
      package.json
  2. 17
      src/helpers/reset.js
  3. 8
      yarn.lock

2
package.json

@ -41,7 +41,7 @@
"@ledgerhq/hw-app-xrp": "^4.35.0", "@ledgerhq/hw-app-xrp": "^4.35.0",
"@ledgerhq/hw-transport": "^4.35.0", "@ledgerhq/hw-transport": "^4.35.0",
"@ledgerhq/hw-transport-node-hid": "^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", "@ledgerhq/live-common": "4.16.1",
"animated": "^0.2.2", "animated": "^0.2.2",
"async": "^2.6.1", "async": "^2.6.1",

17
src/helpers/reset.js

@ -1,23 +1,16 @@
// @flow // @flow
import fs from 'fs'
import { shell, remote } from 'electron' import { shell, remote } from 'electron'
import path from 'path'
import rimraf from 'rimraf'
import resolveUserDataDirectory from 'helpers/resolveUserDataDirectory' import resolveUserDataDirectory from 'helpers/resolveUserDataDirectory'
import { disable as disableDBMiddleware } from 'middlewares/db' import { disable as disableDBMiddleware } from 'middlewares/db'
import db from 'helpers/db' import db from 'helpers/db'
import { delay } from 'helpers/promise' import { delay } from 'helpers/promise'
import killInternalProcess from 'commands/killInternalProcess' 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() await killInternalProcess.send().toPromise()
const dbpath = path.resolve(resolveUserDataDirectory(), 'sqlite/') withLibcore(core => core.freshResetAll())
rimraf.sync(dbpath, { glob: false })
if (fs.existsSync(dbpath)) {
throw new DBNotReset()
}
} }
function reload() { function reload() {
@ -30,7 +23,7 @@ export async function hardReset() {
disableDBMiddleware() disableDBMiddleware()
db.resetAll() db.resetAll()
await delay(500) await delay(500)
await resetLibcoreDatabase() await resetLibcore()
reload() reload()
} }
@ -38,7 +31,7 @@ export async function softReset({ cleanAccountsCache }: *) {
cleanAccountsCache() cleanAccountsCache()
await delay(500) await delay(500)
await db.cleanCache() await db.cleanCache()
await resetLibcoreDatabase() await resetLibcore()
reload() reload()
} }

8
yarn.lock

@ -1722,10 +1722,10 @@
dependencies: dependencies:
events "^3.0.0" events "^3.0.0"
"@ledgerhq/ledger-core@2.0.0-rc.16": "@ledgerhq/ledger-core@2.0.0-rc.19":
version "2.0.0-rc.16" version "2.0.0-rc.19"
resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.16.tgz#51f141c0143edb020e38855bf2e2619e3446e74f" resolved "https://registry.yarnpkg.com/@ledgerhq/ledger-core/-/ledger-core-2.0.0-rc.19.tgz#f8cd0bdc4e8f067bd95aced895d3e1190bb63f06"
integrity sha512-gmbeXRBg4NSqzH6+EajYTzaQlwN5ugaN1nH0SI6BvRqMfcorxNRE8byfh3F2u+7TNchBW72vOZnKPDShaR9/pQ== integrity sha512-pkSVOFNGYYiujJFCJ7JkQrwK5YMVx6MoyXBD4jA+SKthlZ8zo3X3jfhRJdZ1rUiI87GP/ncdh0Kc+epuWTqlDQ==
dependencies: dependencies:
bindings "^1.3.0" bindings "^1.3.0"
nan "^2.6.2" nan "^2.6.2"

Loading…
Cancel
Save