Merge branch 'master' into feature/tokens

# Conflicts:
#	packages/auditor-backoffice-ui/src/InstanceRoutes.tsx
#	packages/merchant-backoffice-ui/src/declaration.d.ts
#	packages/merchant-backoffice-ui/src/schemas/index.ts

1 files changed, 13 insertions, 12 deletions

diff --git a/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts b/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts
index 8e1726aba..47a17a1f2 100644
--- a/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts
+++ b/packages/taler-harness/src/integrationtests/test-exchange-deposit.ts
@@ -26,20 +26,19 @@ import {
 } from "@gnu-taler/taler-util";
 import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
 import {
-  checkReserve,
   CryptoDispatcher,
+  SynchronousCryptoWorkerFactoryPlain,
+} from "@gnu-taler/taler-wallet-core";
+import {
+  checkReserve,
   depositCoin,
   downloadExchangeInfo,
   findDenomOrThrow,
-  SynchronousCryptoWorkerFactoryPlain,
-  topupReserveWithDemobank,
-  Wallet,
+  topupReserveWithBank,
   withdrawCoin,
-} from "@gnu-taler/taler-wallet-core";
+} from "@gnu-taler/taler-wallet-core/dbless";
 import { GlobalTestState } from "../harness/harness.js";
-import {
-  createSimpleTestkudosEnvironmentV2,
-} from "../harness/helpers.js";
+import { createSimpleTestkudosEnvironmentV2 } from "../harness/helpers.js";
 
 /**
  * Run test for basic, bank-integrated withdrawal and payment.
@@ -64,7 +63,7 @@ export async function runExchangeDepositTest(t: GlobalTestState) {
 
     const reserveKeyPair = await cryptoApi.createEddsaKeypair({});
 
-    await topupReserveWithDemobank({
+    await topupReserveWithBank({
       http,
       amount: "TESTKUDOS:10" as AmountString,
       corebankApiBaseUrl: bank.corebankApiBaseUrl,
@@ -76,9 +75,11 @@ export async function runExchangeDepositTest(t: GlobalTestState) {
 
     await checkReserve(http, exchange.baseUrl, reserveKeyPair.pub);
 
-    const d1 = findDenomOrThrow(exchangeInfo, "TESTKUDOS:8" as AmountString, {
-      denomselAllowLate: Wallet.defaultConfig.testing.denomselAllowLate,
-    });
+    const d1 = findDenomOrThrow(
+      exchangeInfo,
+      "TESTKUDOS:8" as AmountString,
+      {},
+    );
 
     const coin = await withdrawCoin({
       http,