From 7d90a7454c093e99e33d06d400ae365852be0117 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 17 Nov 2023 13:24:44 +0100
Subject: dce

---
 contrib/wallet-core                      | 2 +-
 src/auditor/generate-auditor-basedb.conf | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 621dad2c2..4cfef06e8 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 621dad2c2ec9a2adc52076cebf65891d6764c802
+Subproject commit 4cfef06e890f1e556027c9e294a9c7736ec1ecbf
diff --git a/src/auditor/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf
index f718886dc..3b107ccf1 100644
--- a/src/auditor/generate-auditor-basedb.conf
+++ b/src/auditor/generate-auditor-basedb.conf
@@ -29,11 +29,6 @@ USERNAME = exchange
 PASSWORD = x
 
 [merchant]
-WIREFORMAT = default
-DEFAULT_MAX_DEPOSIT_FEE = TESTKUDOS:0.1
-KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
-DEFAULT_MAX_WIRE_FEE = TESTKUDOS:0.10
-WIRE_TRANSFER_DELAY = 1 minute
 FORCE_AUDIT = YES
 
 [merchantdb-postgres]
-- 
cgit v1.2.3