diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-05 14:07:23 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-06-05 14:07:23 +0200 |
| commit | b9963f75255e416ca79b2f5c3081bde4ba78fab0 (patch) | |
| tree | 9575e9558b6f8960798c09dec681dc277f96babc /src/exchange/taler-exchange-httpd_purses_merge.c | |
| parent | 6c81796d6f39e932d58b4fc1729b472d0e46e3d1 (diff) | |
complete P2P/W2W conflict handling, deduplicate code across handlers
Diffstat (limited to 'src/exchange/taler-exchange-httpd_purses_merge.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c index d87fb16d..5f09f198 100644 --- a/src/exchange/taler-exchange-httpd_purses_merge.c +++ b/src/exchange/taler-exchange-httpd_purses_merge.c @@ -325,14 +325,13 @@ merge_transaction (void *cls, GNUNET_JSON_pack_data_auto ("merge_sig", &merge_sig), GNUNET_JSON_pack_allow_null ( - GNUNET_JSON_pack_string ("partner_base_url", + GNUNET_JSON_pack_string ("partner_url", partner_url)), GNUNET_JSON_pack_data_auto ("reserve_pub", &reserve_pub)); GNUNET_free (partner_url); return GNUNET_DB_STATUS_HARD_ERROR; } - // FIXME: if ! kyc check, return 451! return qs; } |