From 67e5d68b9309c6d35a92bb052879c41854b2ea73 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 10 Jun 2021 10:00:36 +0200
Subject: [PATCH] fix merchant instance creation in some tests

---
 packages/taler-wallet-cli/src/index.ts               |  1 +
 .../taler-wallet-cli/src/integrationtests/helpers.ts | 12 ++++++------
 packages/taler-wallet-core/src/db.ts                 |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/taler-wallet-cli/src/index.ts b/packages/taler-wallet-cli/src/index.ts
index 1e22b4caa..0f4199d57 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -192,6 +192,7 @@ async function withWallet<T>(
     }
     process.exit(1);
   } finally {
+    logger.info("operation with wallet finished, stopping");
     wallet.stop();
   }
 }
diff --git a/packages/taler-wallet-cli/src/integrationtests/helpers.ts b/packages/taler-wallet-cli/src/integrationtests/helpers.ts
index 7b9ef90bd..ab8939eeb 100644
--- a/packages/taler-wallet-cli/src/integrationtests/helpers.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/helpers.ts
@@ -218,18 +218,18 @@ export async function createFaultInjectedMerchantTestkudosEnvironment(
   await merchant.start();
   await merchant.pingUntilAvailable();
 
-  await merchant.addInstance({
-    id: "minst1",
-    name: "minst1",
-    paytoUris: ["payto://x-taler-bank/minst1"],
-  });
-
   await merchant.addInstance({
     id: "default",
     name: "Default Instance",
     paytoUris: [`payto://x-taler-bank/merchant-default`],
   });
 
+  await merchant.addInstance({
+    id: "minst1",
+    name: "minst1",
+    paytoUris: ["payto://x-taler-bank/minst1"],
+  });
+
   console.log("setup done!");
 
   const wallet = new WalletCli(t);
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts
index 14f61c8db..b6bab02c5 100644
--- a/packages/taler-wallet-core/src/db.ts
+++ b/packages/taler-wallet-core/src/db.ts
@@ -1756,7 +1756,7 @@ export const WalletStoresV1 = {
         "byFulfillmentUrl",
         "download.contractData.fulfillmentUrl",
       ),
-      byMerchantUrlAndOrderId: describeIndex("byOrderId", [
+      byMerchantUrlAndOrderId: describeIndex("byMerchantUrlAndOrderId", [
         "download.contractData.merchantBaseUrl",
         "download.contractData.orderId",
       ]),