-generate 404 on non-existing accounts for fakebank, use payto://-URIs with receiver-name in tests

41 files changed, 160 insertions, 212 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index ab72d9729..fefb7c984 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -139,7 +139,6 @@ check_PROGRAMS = \
   test_auditor_api_version_rsa \
   test_auditor_api_version_cs \
   test_bank_api_with_fakebank \
-  test_bank_api_with_pybank \
   test_bank_api_with_nexus \
   test_exchange_api_cs \
   test_exchange_api_rsa \
@@ -158,8 +157,7 @@ if HAVE_TWISTER
   check_PROGRAMS += \
     test_exchange_api_twisted_cs \
     test_exchange_api_twisted_rsa \
-    test_bank_api_with_fakebank_twisted \
-    test_bank_api_with_pybank_twisted
+    test_bank_api_with_fakebank_twisted
 endif
 
 
@@ -246,15 +244,6 @@ test_bank_api_with_fakebank_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(XLIB)
 
-test_bank_api_with_pybank_SOURCES = \
-  test_bank_api.c
-test_bank_api_with_pybank_LDADD = \
-  libtalertesting.la \
-  $(top_builddir)/src/lib/libtalerexchange.la \
-  -lgnunetutil \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(XLIB)
-
 test_exchange_api_cs_SOURCES = \
   test_exchange_api.c
 test_exchange_api_cs_LDADD = \
@@ -523,23 +512,6 @@ test_bank_api_with_fakebank_twisted_LDADD = \
   -ljansson \
   $(XLIB)
 
-test_bank_api_with_pybank_twisted_SOURCES = \
-  test_bank_api_twisted.c
-test_bank_api_with_pybank_twisted_LDADD = \
-  libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
-  $(top_builddir)/src/lib/libtalerexchange.la \
-  $(top_builddir)/src/json/libtalerjson.la \
-  libtalertwistertesting.la \
-  -lgnunettesting \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson  \
-  $(XLIB)
-
-
 test_kyc_api_SOURCES = \
   test_kyc_api.c
 test_kyc_api_LDADD = \
@@ -565,8 +537,6 @@ EXTRA_DIST = \
   test_auditor_api_expire_reserve_now-rsa.conf \
   test_bank_api_fakebank.conf \
   test_bank_api_fakebank_twisted.conf \
-  test_bank_api_pybank.conf \
-  test_bank_api_pybank_twisted.conf \
   test_exchange_api_home/.config/taler/account-2.json \
   test_exchange_api_home/.local/share/taler/exchange-offline/master.priv \
   test_exchange_api_home/.local/share/taler/exchange/offline-keys/master.priv \
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index dfa017d0d..d3c6c4f2f 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -69,7 +69,7 @@ LEGAL_RESERVE_EXPIRATION_TIME = 7 years
 [exchange-account-1]
 
 # What is the account URL?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index fda1acd77..ae8ba2329 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -57,7 +57,7 @@ PORT = 8083
 
 [exchange-account-1]
 # What is the account URL?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_auditor_api-cs.conf b/src/testing/test_auditor_api-cs.conf
index 3a9092451..cfd1fa6cc 100644
--- a/src/testing/test_auditor_api-cs.conf
+++ b/src/testing/test_auditor_api-cs.conf
@@ -56,7 +56,7 @@ CONFIG = "postgres:///talercheck"
 # payto://-format.
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:8082/42/"
@@ -68,7 +68,7 @@ HTTP_PORT = 8082
 
 [exchange-account-2]
 # What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_auditor_api-rsa.conf b/src/testing/test_auditor_api-rsa.conf
index e226abb26..577d9057a 100644
--- a/src/testing/test_auditor_api-rsa.conf
+++ b/src/testing/test_auditor_api-rsa.conf
@@ -57,7 +57,7 @@ CONFIG = "postgres:///talercheck"
 # payto://-format.
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:8082/42/"
@@ -69,7 +69,7 @@ HTTP_PORT = 8082
 
 [exchange-account-2]
 # What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
index e103697e5..305d31a09 100644
--- a/src/testing/test_auditor_api.c
+++ b/src/testing/test_auditor_api.c
@@ -657,7 +657,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_bank_api_fakebank.conf b/src/testing/test_bank_api_fakebank.conf
index b97423987..1e5a4d18e 100644
--- a/src/testing/test_bank_api_fakebank.conf
+++ b/src/testing/test_bank_api_fakebank.conf
@@ -4,7 +4,7 @@
 currency = KUDOS
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 
 [exchange-accountcredentials-2]
 WIRE_GATEWAY_URL = "http://localhost:8081/2/"
diff --git a/src/testing/test_bank_api_fakebank_twisted.conf b/src/testing/test_bank_api_fakebank_twisted.conf
index 4dab123a7..6d316c141 100644
--- a/src/testing/test_bank_api_fakebank_twisted.conf
+++ b/src/testing/test_bank_api_fakebank_twisted.conf
@@ -28,10 +28,10 @@ http_port = 8081
 database = postgres:///talercheck
 
 [exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost:8081/1
+PAYTO_URI = "payto://x-taler-bank/localhost:8081/1?receiver-name=1"
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost:8081/2
+PAYTO_URI = "payto://x-taler-bank/localhost:8081/2?receiver-name=2"
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
diff --git a/src/testing/test_bank_api_pybank.conf b/src/testing/test_bank_api_pybank.conf
deleted file mode 100644
index 6603ba8a5..000000000
--- a/src/testing/test_bank_api_pybank.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is in the public domain.
-
-[taler]
-currency = KUDOS
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8081/taler-wire-gateway/Exchange/"
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
-
-[bank]
-SERVE = http
-HTTP_PORT = 8081
-DATABASE = postgres:///talercheck
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
diff --git a/src/testing/test_bank_api_pybank_twisted.conf b/src/testing/test_bank_api_pybank_twisted.conf
deleted file mode 100644
index d89cf0469..000000000
--- a/src/testing/test_bank_api_pybank_twisted.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-[twister]
-# HTTP listen port for twister
-HTTP_PORT = 8888
-SERVE = tcp
-
-# HTTP Destination for twister.  The test-Webserver needs
-# to listen on the port used here.  Note: no trailing '/'!
-DESTINATION_BASE_URL = "http://localhost:8081"
-
-# Control port for TCP
-# PORT = 8889
-HOSTNAME = localhost
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-
-# Control port for UNIX
-UNIXPATH = /tmp/taler-service-twister.sock
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[auditor]
-BASE_URL = "http://localhost:8083/"
-
-[taler]
-currency = KUDOS
-
-[bank]
-serve = http
-http_port = 8081
-database = postgres:///talercheck
-
-[exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/1
-
-
-[exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/Exchange
-
-[exchange-accountcredentials-2]
-WIRE_GATEWAY_URL = "http://localhost:8888/taler-wire-gateway/Exchange/"
-WIRE_GATEWAY_AUTH_METHOD = basic
-USERNAME = Exchange
-PASSWORD = x
diff --git a/src/testing/test_exchange_api-cs.conf b/src/testing/test_exchange_api-cs.conf
index 204718120..9485a724d 100644
--- a/src/testing/test_exchange_api-cs.conf
+++ b/src/testing/test_exchange_api-cs.conf
@@ -64,7 +64,7 @@ CONFIG = "postgres:///talercheck"
 # payto://-format.
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 # ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
@@ -72,7 +72,7 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/"
 
 [exchange-account-2]
 # What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api-rsa.conf b/src/testing/test_exchange_api-rsa.conf
index be0e4bade..bd27d560f 100644
--- a/src/testing/test_exchange_api-rsa.conf
+++ b/src/testing/test_exchange_api-rsa.conf
@@ -65,7 +65,7 @@ CONFIG = "postgres:///talercheck"
 # payto://-format.
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 # ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-1]
@@ -73,7 +73,7 @@ WIRE_GATEWAY_URL = "http://localhost:9081/42/"
 
 [exchange-account-2]
 # What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index da323ca51..54cc0e7fd 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -1170,7 +1170,7 @@ run (void *cls,
       TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
                                                       config_file),
       TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                  "payto://x-taler-bank/localhost/2",
+                                  "payto://x-taler-bank/localhost/2?receiver-name=2",
                                   MHD_HTTP_NO_CONTENT,
                                   false),
       TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_exchange_api_keys_cherry_picking-cs.conf b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
index 8967d6c0a..751850cb2 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking-cs.conf
@@ -56,13 +56,13 @@ CONFIG = "postgres:///talercheck"
 CONFIG = "postgres:///talercheck"
 
 [exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/42
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:9082/42/"
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
index e616738f0..b9ad30549 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf
@@ -56,13 +56,13 @@ CONFIG = "postgres:///talercheck"
 CONFIG = "postgres:///talercheck"
 
 [exchange-account-1]
-PAYTO_URI = payto://x-taler-bank/localhost/42
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:9082/42/"
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c
index 25bdad06d..4ad2d7207 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.c
+++ b/src/testing/test_exchange_api_keys_cherry_picking.c
@@ -63,7 +63,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
diff --git a/src/testing/test_exchange_api_overlapping_keys_bug.c b/src/testing/test_exchange_api_overlapping_keys_bug.c
index 54c552236..1314bdf54 100644
--- a/src/testing/test_exchange_api_overlapping_keys_bug.c
+++ b/src/testing/test_exchange_api_overlapping_keys_bug.c
@@ -64,7 +64,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_exchange_api_revocation.c b/src/testing/test_exchange_api_revocation.c
index bb3dcc06e..33a92551d 100644
--- a/src/testing/test_exchange_api_revocation.c
+++ b/src/testing/test_exchange_api_revocation.c
@@ -67,7 +67,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_exchange_api_twisted-cs.conf b/src/testing/test_exchange_api_twisted-cs.conf
index 7d2afb9cb..abb88a742 100644
--- a/src/testing/test_exchange_api_twisted-cs.conf
+++ b/src/testing/test_exchange_api_twisted-cs.conf
@@ -48,14 +48,14 @@ CONFIG = "postgres:///talercheck"
 
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:9081/42/"
 WIRE_GATEWAY_AUTH_METHOD = NONE
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api_twisted-rsa.conf b/src/testing/test_exchange_api_twisted-rsa.conf
index 077d49c16..847d9e1ce 100644
--- a/src/testing/test_exchange_api_twisted-rsa.conf
+++ b/src/testing/test_exchange_api_twisted-rsa.conf
@@ -48,14 +48,14 @@ CONFIG = "postgres:///talercheck"
 
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:9081/42/"
 WIRE_GATEWAY_AUTH_METHOD = NONE
 
 [exchange-account-2]
-PAYTO_URI = payto://x-taler-bank/localhost/2
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c
index f8cfa64b7..0fb35b45d 100644
--- a/src/testing/test_exchange_api_twisted.c
+++ b/src/testing/test_exchange_api_twisted.c
@@ -243,7 +243,7 @@ run (void *cls,
 
   struct TALER_TESTING_Command commands[] = {
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_exchange_management_api.c b/src/testing/test_exchange_management_api.c
index 9fe5cf595..2bf0af3bd 100644
--- a/src/testing/test_exchange_management_api.c
+++ b/src/testing/test_exchange_management_api.c
@@ -117,31 +117,31 @@ run (void *cls,
                                     MHD_HTTP_NO_CONTENT,
                                     false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/42",
+                                "payto://x-taler-bank/localhost/42?receiver-name=42",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-idempotent",
-                                "payto://x-taler-bank/localhost/42",
+                                "payto://x-taler-bank/localhost/42?receiver-name=42",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-another",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_wire_add ("add-wire-account-bad-signature",
-                                "payto://x-taler-bank/localhost/44",
+                                "payto://x-taler-bank/localhost/44?receiver-name=44",
                                 MHD_HTTP_FORBIDDEN,
                                 true),
     TALER_TESTING_cmd_wire_del ("del-wire-account-not-found",
-                                "payto://x-taler-bank/localhost/44",
+                                "payto://x-taler-bank/localhost/44?receiver-name=44",
                                 MHD_HTTP_NOT_FOUND,
                                 false),
     TALER_TESTING_cmd_wire_del ("del-wire-account-bad-signature",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_FORBIDDEN,
                                 true),
     TALER_TESTING_cmd_wire_del ("del-wire-account-ok",
-                                "payto://x-taler-bank/localhost/43",
+                                "payto://x-taler-bank/localhost/43?receiver-name=43",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("download-future-keys",
diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c
index 3b11d04c5..647c56c8f 100644
--- a/src/testing/test_exchange_p2p.c
+++ b/src/testing/test_exchange_p2p.c
@@ -365,7 +365,7 @@ run (void *cls,
     TALER_TESTING_cmd_exec_offline_sign_extensions ("offline-sign-extensions",
                                                     config_file),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-wire-fees",
diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c
index 669101d88..13244993b 100644
--- a/src/testing/test_kyc_api.c
+++ b/src/testing/test_kyc_api.c
@@ -216,7 +216,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf
index 539c59ec1..09e7cdc7e 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -74,7 +74,7 @@ CONFIG = "postgres:///talercheck"
 # payto://-format.
 [exchange-account-1]
 # What is the URL of our account?
-PAYTO_URI = "payto://x-taler-bank/localhost/42"
+PAYTO_URI = "payto://x-taler-bank/localhost/42?receiver-name=42"
 
 [exchange-accountcredentials-1]
 WIRE_GATEWAY_URL = "http://localhost:8082/42/"
@@ -86,7 +86,7 @@ HTTP_PORT = 8082
 
 [exchange-account-2]
 # What is the bank account (with the "Taler Bank" demo system)?
-PAYTO_URI = "payto://x-taler-bank/localhost/2"
+PAYTO_URI = "payto://x-taler-bank/localhost/2?receiver-name=2"
 ENABLE_DEBIT = YES
 ENABLE_CREDIT = YES
 
diff --git a/src/testing/test_taler_exchange_aggregator.c b/src/testing/test_taler_exchange_aggregator.c
index ce0c73404..d42d59762 100644
--- a/src/testing/test_taler_exchange_aggregator.c
+++ b/src/testing/test_taler_exchange_aggregator.c
@@ -187,17 +187,17 @@ run (void *cls,
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/4"),
+                                           "payto://x-taler-bank/localhost/4?receiver-name=4"),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3b",
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/4"),
+                                           "payto://x-taler-bank/localhost/4?receiver-name=4"),
     TALER_TESTING_cmd_check_bank_transfer ("expect-deposit-3c",
                                            ec.exchange_url,
                                            "EUR:0.89",
                                            bc.exchange_payto,
-                                           "payto://x-taler-bank/localhost/5"),
+                                           "payto://x-taler-bank/localhost/5?receiver-name=5"),
     TALER_TESTING_cmd_check_bank_empty ("expect-empty-transactions-after-3"),
 
     /* checking that aggregator waits for the deadline. */
diff --git a/src/testing/test_taler_exchange_wirewatch.c b/src/testing/test_taler_exchange_wirewatch.c
index ad5151e2d..d62ca55e4 100644
--- a/src/testing/test_taler_exchange_wirewatch.c
+++ b/src/testing/test_taler_exchange_wirewatch.c
@@ -91,7 +91,7 @@ run (void *cls,
                                    MHD_HTTP_NO_CONTENT,
                                    false),
     TALER_TESTING_cmd_wire_add ("add-wire-account",
-                                "payto://x-taler-bank/localhost/2",
+                                "payto://x-taler-bank/localhost/2?receiver-name=2",
                                 MHD_HTTP_NO_CONTENT,
                                 false),
     TALER_TESTING_cmd_exec_offline_sign_keys ("offline-sign-future-keys",
diff --git a/src/testing/testing_api_cmd_auditor_exec_auditor.c b/src/testing/testing_api_cmd_auditor_exec_auditor.c
index 8ec128c01..588be43d8 100644
--- a/src/testing/testing_api_cmd_auditor_exec_auditor.c
+++ b/src/testing/testing_api_cmd_auditor_exec_auditor.c
@@ -68,6 +68,7 @@ auditor_run (void *cls,
                                "taler-auditor",
                                "taler-auditor",
                                "-c", ks->config_filename,
+                               "-I",
                                NULL);
   if (NULL == ks->auditor_proc)
   {
diff --git a/src/testing/testing_api_cmd_bank_admin_add_incoming.c b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
index 07ee4068b..28d251a4f 100644
--- a/src/testing/testing_api_cmd_bank_admin_add_incoming.c
+++ b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
@@ -433,10 +433,12 @@ admin_add_incoming_traits (void *cls,
       TALER_TESTING_make_trait_exchange_bank_account_url (
         &fts->exchange_credit_url),
       TALER_TESTING_make_trait_amount (&fts->amount),
-      TALER_TESTING_make_trait_timestamp (0, &fts->timestamp),
+      TALER_TESTING_make_trait_timestamp (0,
+                                          &fts->timestamp),
       TALER_TESTING_make_trait_reserve_priv (&fts->reserve_priv),
       TALER_TESTING_make_trait_reserve_pub (&fts->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&fts->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &fts->reserve_history),
       TALER_TESTING_trait_end ()
     };
 
@@ -457,7 +459,8 @@ admin_add_incoming_traits (void *cls,
       TALER_TESTING_make_trait_amount (&fts->amount),
       TALER_TESTING_make_trait_timestamp (0, &fts->timestamp),
       TALER_TESTING_make_trait_reserve_pub (&fts->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&fts->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &fts->reserve_history),
       TALER_TESTING_trait_end ()
     };
 
diff --git a/src/testing/testing_api_cmd_bank_history_credit.c b/src/testing/testing_api_cmd_bank_history_credit.c
index a7ad40a43..62bc47e11 100644
--- a/src/testing/testing_api_cmd_bank_history_credit.c
+++ b/src/testing/testing_api_cmd_bank_history_credit.c
@@ -311,7 +311,7 @@ build_history (struct TALER_TESTING_Interpreter *is,
  * @param details the expected transaction details.
  * @return #GNUNET_OK if the transaction is what we expect.
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_result (struct History *h,
               unsigned int total,
               unsigned int off,
@@ -389,6 +389,13 @@ history_cb (void *cls,
   if (NULL == details)
   {
     hs->hh = NULL;
+    if ( (MHD_HTTP_NOT_FOUND == http_status) &&
+         (0 == hs->total) )
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return GNUNET_OK;
+    }
     if ( (hs->results_obtained != hs->total) ||
          (hs->failed) ||
          (MHD_HTTP_NO_CONTENT != http_status) )
@@ -422,10 +429,11 @@ history_cb (void *cls,
   }
 
   /* check current element */
-  if (GNUNET_OK != check_result (hs->h,
-                                 hs->total,
-                                 hs->results_obtained,
-                                 details))
+  if (GNUNET_OK !=
+      check_result (hs->h,
+                    hs->total,
+                    hs->results_obtained,
+                    details))
   {
     char *acc;
 
@@ -439,6 +447,8 @@ history_cb (void *cls,
     if (NULL != acc)
       free (acc);
     hs->failed = true;
+    hs->hh = NULL;
+    TALER_TESTING_interpreter_fail (is);
     return GNUNET_SYSERR;
   }
   hs->results_obtained++;
diff --git a/src/testing/testing_api_cmd_bank_history_debit.c b/src/testing/testing_api_cmd_bank_history_debit.c
index a1dee81e1..cb3f68097 100644
--- a/src/testing/testing_api_cmd_bank_history_debit.c
+++ b/src/testing/testing_api_cmd_bank_history_debit.c
@@ -391,6 +391,13 @@ history_cb (void *cls,
   if (NULL == details)
   {
     hs->hh = NULL;
+    if ( (MHD_HTTP_NOT_FOUND == http_status) &&
+         (0 == hs->total) )
+    {
+      /* not found is OK for empty history */
+      TALER_TESTING_interpreter_next (is);
+      return GNUNET_OK;
+    }
     if ( (hs->results_obtained != hs->total) ||
          (GNUNET_YES == hs->failed) ||
          (MHD_HTTP_NO_CONTENT != http_status) )
@@ -424,10 +431,11 @@ history_cb (void *cls,
   }
 
   /* check current element */
-  if (GNUNET_OK != check_result (hs->h,
-                                 hs->total,
-                                 hs->results_obtained,
-                                 details))
+  if (GNUNET_OK !=
+      check_result (hs->h,
+                    hs->total,
+                    hs->results_obtained,
+                    details))
   {
     char *acc;
 
@@ -441,6 +449,8 @@ history_cb (void *cls,
     if (NULL != acc)
       free (acc);
     hs->failed = GNUNET_YES;
+    hs->hh = NULL;
+    TALER_TESTING_interpreter_fail (is);
     return GNUNET_SYSERR;
   }
   hs->results_obtained++;
diff --git a/src/testing/testing_api_cmd_batch_withdraw.c b/src/testing/testing_api_cmd_batch_withdraw.c
index 5e480f12b..f135f5def 100644
--- a/src/testing/testing_api_cmd_batch_withdraw.c
+++ b/src/testing/testing_api_cmd_batch_withdraw.c
@@ -87,8 +87,6 @@ struct CoinState
   /**
    * Reserve history entry that corresponds to this coin.
    * Will be of type #TALER_EXCHANGE_RTT_WITHDRAWAL.
-   *
-   * FIXME: how to export one per coin?
    */
   struct TALER_EXCHANGE_ReserveHistoryEntry reserve_history;
 
@@ -401,8 +399,8 @@ batch_withdraw_traits (void *cls,
   struct CoinState *cs = &ws->coins[index];
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    // FIXME: bug!
-    TALER_TESTING_make_trait_reserve_history (&cs->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (index,
+                                              &cs->reserve_history),
     TALER_TESTING_make_trait_coin_priv (index,
                                         &cs->coin_priv),
     TALER_TESTING_make_trait_planchet_secrets (index,
diff --git a/src/testing/testing_api_cmd_exec_closer.c b/src/testing/testing_api_cmd_exec_closer.c
index 57346f333..75eab2d9f 100644
--- a/src/testing/testing_api_cmd_exec_closer.c
+++ b/src/testing/testing_api_cmd_exec_closer.c
@@ -169,7 +169,8 @@ closer_traits (void *cls,
   struct TALER_TESTING_Trait xtraits[] = {
     TALER_TESTING_make_trait_process (&as->closer_proc),
     TALER_TESTING_make_trait_reserve_pub (&as->reserve_pub),
-    TALER_TESTING_make_trait_reserve_history (&as->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &as->reserve_history),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_insert_deposit.c b/src/testing/testing_api_cmd_insert_deposit.c
index 33e6cdcef..a82caa730 100644
--- a/src/testing/testing_api_cmd_insert_deposit.c
+++ b/src/testing/testing_api_cmd_insert_deposit.c
@@ -230,7 +230,8 @@ insert_deposit_run (void *cls,
     TALER_blinded_denom_sig_free (&bds);
   }
   GNUNET_asprintf (&deposit.receiver_wire_account,
-                   "payto://x-taler-bank/localhost/%s",
+                   "payto://x-taler-bank/localhost/%s?receiver-name=%s",
+                   ids->merchant_account,
                    ids->merchant_account);
   memset (&deposit.wire_salt,
           46,
diff --git a/src/testing/testing_api_cmd_purse_deposit.c b/src/testing/testing_api_cmd_purse_deposit.c
index 1c6dcdd9b..fa1b900da 100644
--- a/src/testing/testing_api_cmd_purse_deposit.c
+++ b/src/testing/testing_api_cmd_purse_deposit.c
@@ -396,7 +396,8 @@ deposit_traits (void *cls,
   struct PurseDepositState *ds = cls;
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_reserve_history (&ds->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &ds->reserve_history),
     TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
     TALER_TESTING_make_trait_purse_pub (&ds->purse_pub),
     TALER_TESTING_trait_end ()
diff --git a/src/testing/testing_api_cmd_purse_merge.c b/src/testing/testing_api_cmd_purse_merge.c
index 50e0ac1bc..68cd5ea57 100644
--- a/src/testing/testing_api_cmd_purse_merge.c
+++ b/src/testing/testing_api_cmd_purse_merge.c
@@ -350,7 +350,8 @@ merge_traits (void *cls,
   struct PurseMergeState *ds = cls;
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_reserve_history (&ds->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &ds->reserve_history),
     TALER_TESTING_make_trait_reserve_pub (&ds->reserve_pub),
     TALER_TESTING_make_trait_timestamp (0,
                                         &ds->merge_timestamp),
diff --git a/src/testing/testing_api_cmd_recoup.c b/src/testing/testing_api_cmd_recoup.c
index 1a8290206..ed8c7eed7 100644
--- a/src/testing/testing_api_cmd_recoup.c
+++ b/src/testing/testing_api_cmd_recoup.c
@@ -328,7 +328,8 @@ recoup_traits (void *cls,
   {
     struct TALER_TESTING_Trait traits[] = {
       TALER_TESTING_make_trait_reserve_pub (&ps->reserve_pub),
-      TALER_TESTING_make_trait_reserve_history (&ps->reserve_history),
+      TALER_TESTING_make_trait_reserve_history (0,
+                                                &ps->reserve_history),
       TALER_TESTING_trait_end ()
     };
 
diff --git a/src/testing/testing_api_cmd_reserve_history.c b/src/testing/testing_api_cmd_reserve_history.c
index 6cee5af15..e63cca868 100644
--- a/src/testing/testing_api_cmd_reserve_history.c
+++ b/src/testing/testing_api_cmd_reserve_history.c
@@ -95,7 +95,7 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
                  const struct TALER_TESTING_Command *cmd,
                  unsigned int history_length,
                  const struct TALER_EXCHANGE_ReserveHistoryEntry *history,
-                 int *found)
+                 bool *found)
 {
   if (TALER_TESTING_cmd_is_batch (cmd))
   {
@@ -134,7 +134,6 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
   else
   {
     const struct TALER_ReservePublicKeyP *rp;
-    const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
 
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_reserve_pub (cmd,
@@ -144,32 +143,40 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
         GNUNET_memcmp (rp,
                        reserve_pub))
       return GNUNET_OK; /* command affects some _other_ reserve */
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_history (cmd,
-                                                 &he))
-    {
-      /* NOTE: only for debugging... */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
-                  cmd->label);
-      return GNUNET_OK; /* command does nothing for reserves */
-    }
-    for (unsigned int i = 0; i<history_length; i++)
+    for (unsigned int j = 0; true; j++)
     {
-      if (found[i])
-        continue; /* already found, skip */
-      if (0 ==
-          TALER_TESTING_history_entry_cmp (he,
-                                           &history[i]))
+      const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
+
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_reserve_history (cmd,
+                                                   j,
+                                                   &he))
       {
-        found[i] = GNUNET_YES;
-        return GNUNET_OK;
+        /* NOTE: only for debugging... */
+        if (0 == j)
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
+                      cmd->label);
+        return GNUNET_OK; /* command does nothing for reserves */
       }
+      for (unsigned int i = 0; i<history_length; i++)
+      {
+        if (found[i])
+          continue; /* already found, skip */
+        if (0 ==
+            TALER_TESTING_history_entry_cmp (he,
+                                             &history[i]))
+        {
+          found[i] = true;
+          return GNUNET_OK;
+        }
+      }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Command `%s' reserve history entry #%u not found\n",
+                  cmd->label,
+                  j);
+      return GNUNET_SYSERR;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Command `%s' reserve history entry not found\n",
-                cmd->label);
-    return GNUNET_SYSERR;
   }
 }
 
@@ -237,7 +244,7 @@ reserve_history_cb (void *cls,
     return;
   }
   {
-    int found[rs->details.ok.history_len];
+    bool found[rs->details.ok.history_len];
 
     memset (found,
             0,
@@ -342,7 +349,8 @@ history_traits (void *cls,
   struct HistoryState *hs = cls;
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_reserve_history (&hs->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &hs->reserve_history),
     TALER_TESTING_trait_end ()
   };
 
diff --git a/src/testing/testing_api_cmd_reserve_status.c b/src/testing/testing_api_cmd_reserve_status.c
index 1d104cc3e..9abd99f0b 100644
--- a/src/testing/testing_api_cmd_reserve_status.c
+++ b/src/testing/testing_api_cmd_reserve_status.c
@@ -126,7 +126,6 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
   else
   {
     const struct TALER_ReservePublicKeyP *rp;
-    const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
 
     if (GNUNET_OK !=
         TALER_TESTING_get_trait_reserve_pub (cmd,
@@ -136,32 +135,39 @@ analyze_command (const struct TALER_ReservePublicKeyP *reserve_pub,
         GNUNET_memcmp (rp,
                        reserve_pub))
       return GNUNET_OK; /* command affects some _other_ reserve */
-    if (GNUNET_OK !=
-        TALER_TESTING_get_trait_reserve_history (cmd,
-                                                 &he))
-    {
-      /* NOTE: only for debugging... */
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
-                  cmd->label);
-      return GNUNET_OK; /* command does nothing for reserves */
-    }
-    for (unsigned int i = 0; i<history_length; i++)
+    for (unsigned int j = 0; true; j++)
     {
-      if (found[i])
-        continue; /* already found, skip */
-      if (0 ==
-          TALER_TESTING_history_entry_cmp (he,
-                                           &history[i]))
+      const struct TALER_EXCHANGE_ReserveHistoryEntry *he;
+
+      if (GNUNET_OK !=
+          TALER_TESTING_get_trait_reserve_history (cmd,
+                                                   j,
+                                                   &he))
       {
-        found[i] = GNUNET_YES;
-        return GNUNET_OK;
+        /* NOTE: only for debugging... */
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Command `%s' has the reserve_pub trait, but does not reserve history trait\n",
+                    cmd->label);
+        return GNUNET_OK; /* command does nothing for reserves */
+      }
+      for (unsigned int i = 0; i<history_length; i++)
+      {
+        if (found[i])
+          continue; /* already found, skip */
+        if (0 ==
+            TALER_TESTING_history_entry_cmp (he,
+                                             &history[i]))
+        {
+          found[i] = true;
+          return GNUNET_OK;
+        }
       }
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Command `%s' reserve history entry #%u not found\n",
+                  cmd->label,
+                  j);
+      return GNUNET_SYSERR;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Command `%s' reserve history entry not found\n",
-                cmd->label);
-    return GNUNET_SYSERR;
   }
 }
 
diff --git a/src/testing/testing_api_cmd_withdraw.c b/src/testing/testing_api_cmd_withdraw.c
index 7b287da3f..019c08de4 100644
--- a/src/testing/testing_api_cmd_withdraw.c
+++ b/src/testing/testing_api_cmd_withdraw.c
@@ -521,7 +521,8 @@ withdraw_traits (void *cls,
   struct WithdrawState *ws = cls;
   struct TALER_TESTING_Trait traits[] = {
     /* history entry MUST be first due to response code logic below! */
-    TALER_TESTING_make_trait_reserve_history (&ws->reserve_history),
+    TALER_TESTING_make_trait_reserve_history (0,
+                                              &ws->reserve_history),
     TALER_TESTING_make_trait_coin_priv (0 /* only one coin */,
                                         &ws->coin_priv),
     TALER_TESTING_make_trait_planchet_secret (&ws->ps),
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
index 0d8017e65..1ec2050a2 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -563,8 +563,8 @@ TALER_TESTING_prepare_bank (const char *config_filename,
   }
   GNUNET_CONFIGURATION_destroy (cfg);
   bc->exchange_payto = exchange_payto_uri;
-  bc->user42_payto = "payto://x-taler-bank/localhost/42";
-  bc->user43_payto = "payto://x-taler-bank/localhost/43";
+  bc->user42_payto = "payto://x-taler-bank/localhost/42?receiver-name=42";
+  bc->user43_payto = "payto://x-taler-bank/localhost/43?receiver-name=43";
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Using pybank %s on port %u\n",
               bc->exchange_auth.wire_gateway_url,
@@ -655,8 +655,8 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
    * don't have any auth. */
   bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
   bc->exchange_payto = exchange_payto_uri;
-  bc->user42_payto = "payto://x-taler-bank/localhost/42";
-  bc->user43_payto = "payto://x-taler-bank/localhost/43";
+  bc->user42_payto = "payto://x-taler-bank/localhost/42?receiver-name=42";
+  bc->user43_payto = "payto://x-taler-bank/localhost/43?receiver-name=43";
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exchange payto: %s\n",
               bc->exchange_payto);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "user42_payto: %s\n",