[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: simplify deposit, do not return
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated: simplify deposit, do not return kyc status, not needed |
|
Date: |
Wed, 20 Oct 2021 18:57:01 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 9adb9cfe simplify deposit, do not return kyc status, not needed
9adb9cfe is described below
commit 9adb9cfe6108c783f8154c4db9375b679ebaaa4a
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 20 18:56:59 2021 +0200
simplify deposit, do not return kyc status, not needed
---
src/exchange/taler-exchange-httpd_deposit.c | 28 --------------------
src/include/taler_exchange_service.h | 5 ----
src/include/taler_json_lib.h | 4 +--
src/json/json_wire.c | 41 ++---------------------------
src/lib/exchange_api_deposit.c | 2 --
5 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_deposit.c
b/src/exchange/taler-exchange-httpd_deposit.c
index 42162f8a..38dfd447 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -45,7 +45,6 @@
* operation with the given wiring details.
*
* @param connection connection to the client
- * @param kyc KYC status for the credited account
* @param coin_pub public key of the coin
* @param h_wire hash of wire details
* @param h_contract_terms hash of contract details
@@ -57,7 +56,6 @@
*/
static MHD_RESULT
reply_deposit_success (struct MHD_Connection *connection,
- const struct TALER_EXCHANGEDB_KycStatus *kyc,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const struct GNUNET_HashCode *h_wire,
const struct GNUNET_HashCode *h_contract_terms,
@@ -94,10 +92,6 @@ reply_deposit_success (struct MHD_Connection *connection,
return TALER_MHD_REPLY_JSON_PACK (
connection,
MHD_HTTP_OK,
- GNUNET_JSON_pack_uint64 ("payment_target_uuid",
- kyc->payment_target_uuid),
- GNUNET_JSON_pack_bool ("kyc_ok",
- kyc->ok),
GNUNET_JSON_pack_time_abs ("exchange_timestamp",
exchange_timestamp),
GNUNET_JSON_pack_data_auto ("exchange_sig",
@@ -127,11 +121,6 @@ struct DepositContext
*/
struct TALER_Amount value;
- /**
- * KYC status for the receiving account.
- */
- struct TALER_EXCHANGEDB_KycStatus kyc;
-
/**
* payto:// URI of the credited account.
*/
@@ -161,21 +150,6 @@ deposit_precheck (void *cls,
struct TALER_Amount deposit_fee;
enum GNUNET_DB_QueryStatus qs;
- qs = TEH_plugin->get_kyc_status (TEH_plugin->cls,
- dc->payto_uri,
- &dc->kyc);
- if (qs < 0)
- {
- if (GNUNET_DB_STATUS_HARD_ERROR == qs)
- {
- *mhd_ret = TALER_MHD_reply_with_error (connection,
- MHD_HTTP_INTERNAL_SERVER_ERROR,
- TALER_EC_GENERIC_DB_FETCH_FAILED,
- "get_kyc_status");
- return GNUNET_DB_STATUS_HARD_ERROR;
- }
- return qs;
- }
qs = TEH_plugin->have_deposit (TEH_plugin->cls,
deposit,
GNUNET_YES /* check refund deadline */,
@@ -204,7 +178,6 @@ deposit_precheck (void *cls,
&deposit->amount_with_fee,
&deposit_fee));
*mhd_ret = reply_deposit_success (connection,
- &dc->kyc,
&deposit->coin.coin_pub,
&deposit->h_wire,
&deposit->h_contract_terms,
@@ -637,7 +610,6 @@ TEH_handler_deposit (struct MHD_Connection *connection,
&deposit.amount_with_fee,
&deposit.deposit_fee));
res = reply_deposit_success (connection,
- &dc.kyc,
&deposit.coin.coin_pub,
&deposit.h_wire,
&deposit.h_contract_terms,
diff --git a/src/include/taler_exchange_service.h
b/src/include/taler_exchange_service.h
index 9d48f9d9..0b624391 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -840,11 +840,6 @@ struct TALER_EXCHANGE_DepositResult
*/
const char *transaction_base_url;
- /**
- * Payment target that the merchant should use
- * to check for its KYC status.
- */
- uint64_t payment_target_uuid;
} success;
/**
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index 3581252c..068dea7d 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -503,7 +503,7 @@ TALER_JSON_get_error_code2 (const void *data,
* @param[out] hc set to the hash
* @return #GNUNET_OK on success, #GNUNET_SYSERR if @a wire_s is malformed
*/
-int
+enum GNUNET_GenericReturnValue
TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc);
@@ -516,7 +516,7 @@ TALER_JSON_merchant_wire_signature_hash (const json_t
*wire_s,
* @param master_pub master public key of the exchange
* @return #GNUNET_OK if signature is valid
*/
-int
+enum GNUNET_GenericReturnValue
TALER_JSON_exchange_wire_signature_check (
const json_t *wire_s,
const struct TALER_MasterPublicKeyP *master_pub);
diff --git a/src/json/json_wire.c b/src/json/json_wire.c
index 7ec21da6..f88daefc 100644
--- a/src/json/json_wire.c
+++ b/src/json/json_wire.c
@@ -24,15 +24,7 @@
#include "taler_json_lib.h"
-/**
- * Compute the hash of the given wire details. The resulting
- * hash is what is put into the contract.
- *
- * @param wire_s wire details to hash
- * @param[out] hc set to the hash
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if @a wire_s is malformed
- */
-int
+enum GNUNET_GenericReturnValue
TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc)
{
@@ -78,15 +70,7 @@ TALER_JSON_merchant_wire_signature_hash (const json_t
*wire_s,
}
-/**
- * Check the signature in @a wire_s. Also performs rudimentary
- * checks on the account data *if* supported.
- *
- * @param wire_s signed wire information of an exchange
- * @param master_pub master public key of the exchange
- * @return #GNUNET_OK if signature is valid
- */
-int
+enum GNUNET_GenericReturnValue
TALER_JSON_exchange_wire_signature_check (
const json_t *wire_s,
const struct TALER_MasterPublicKeyP *master_pub)
@@ -131,13 +115,6 @@ TALER_JSON_exchange_wire_signature_check (
}
-/**
- * Create a signed wire statement for the given account.
- *
- * @param payto_uri account specification
- * @param master_priv private key to sign with
- * @return NULL if @a payto_uri is malformed
- */
json_t *
TALER_JSON_exchange_wire_signature_make (
const char *payto_uri,
@@ -167,13 +144,6 @@ TALER_JSON_exchange_wire_signature_make (
}
-/**
- * Obtain the wire method associated with the given
- * wire account details. @a wire_s must contain a payto://-URL
- * under 'payto_uri'.
- *
- * @return NULL on error
- */
char *
TALER_JSON_wire_to_payto (const json_t *wire_s)
{
@@ -204,13 +174,6 @@ TALER_JSON_wire_to_payto (const json_t *wire_s)
}
-/**
- * Obtain the wire method associated with the given
- * wire account details. @a wire_s must contain a payto://-URL
- * under 'url'.
- *
- * @return NULL on error
- */
char *
TALER_JSON_wire_to_method (const json_t *wire_s)
{
diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 92356ac2..35e09bd0 100644
--- a/src/lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -283,8 +283,6 @@ handle_deposit_finished (void *cls,
&dh->exchange_sig),
GNUNET_JSON_spec_fixed_auto ("exchange_pub",
&dh->exchange_pub),
- GNUNET_JSON_spec_uint64 ("payment_target_uuid",
- &dr.details.success.payment_target_uuid),
GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_string ("transaction_base_url",
&dr.details.success.transaction_base_url)),
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: simplify deposit, do not return kyc status, not needed,
gnunet <=