summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-06-10 10:00:36 +0200
committerFlorian Dold <florian@dold.me>2021-06-10 10:00:36 +0200
commit67e5d68b9309c6d35a92bb052879c41854b2ea73 (patch)
treeb48dfc875e4bb1a03acda187b643a64e185f18b9 /packages
parent0ee44c3a5872d00cc1e8295f5b8e54b72d4bbebb (diff)
downloadwallet-core-67e5d68b9309c6d35a92bb052879c41854b2ea73.tar.gz
wallet-core-67e5d68b9309c6d35a92bb052879c41854b2ea73.tar.bz2
wallet-core-67e5d68b9309c6d35a92bb052879c41854b2ea73.zip
fix merchant instance creation in some tests
Diffstat (limited to 'packages')
-rw-r--r--packages/taler-wallet-cli/src/index.ts1
-rw-r--r--packages/taler-wallet-cli/src/integrationtests/helpers.ts12
-rw-r--r--packages/taler-wallet-core/src/db.ts2
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
@@ -219,17 +219,17 @@ export async function createFaultInjectedMerchantTestkudosEnvironment(
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",
]),