Merge branch 'master' into age-withdraw

1 files changed, 2 insertions, 10 deletions

diff --git a/packages/taler-wallet-webextension/src/wxBackend.ts b/packages/taler-wallet-webextension/src/wxBackend.ts
index 95af1a3a4..e7385abe5 100644
--- a/packages/taler-wallet-webextension/src/wxBackend.ts
+++ b/packages/taler-wallet-webextension/src/wxBackend.ts
@@ -50,7 +50,6 @@ import {
   exportDb,
   importDb,
   openPromise,
-  openTalerDatabase,
 } from "@gnu-taler/taler-wallet-core";
 import {
   MessageFromBackend,
@@ -139,7 +138,7 @@ async function runGarbageCollector(): Promise<void> {
   if (!dbBeforeGc) {
     throw Error("no current db before running gc");
   }
-  const dump = await exportDb(dbBeforeGc.idbHandle());
+  const dump = await exportDb(indexedDB as any);
 
   await deleteTalerDatabase(indexedDB as any);
   logger.info("cleaned");
@@ -298,13 +297,6 @@ async function reinitWallet(): Promise<void> {
   }
   currentDatabase = undefined;
   // setBadgeText({ text: "" });
-  try {
-    currentDatabase = await openTalerDatabase(indexedDB as any, reinitWallet);
-  } catch (e) {
-    logger.error("could not open database", e);
-    walletInit.reject(e);
-    return;
-  }
   let httpLib;
   let cryptoWorker;
   let timer;
@@ -325,7 +317,7 @@ async function reinitWallet(): Promise<void> {
   const settings = await platform.getSettingsFromStorage();
   logger.info("Setting up wallet");
   const wallet = await Wallet.create(
-    currentDatabase,
+    indexedDB as any,
     httpLib,
     timer,
     cryptoWorker,