diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-04 21:59:55 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-06-04 22:00:02 +0200 |
| commit | a17781ba8d5f875b5150e524174c5f144aa6c0ba (patch) | |
| tree | c01f11a3810428471e6399b4961942732a21a1f1 /src/exchange | |
| parent | 6512456dc2559577867fdce1f7fe7f1b5a12291f (diff) | |
| download | exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.tar.gz exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.tar.bz2 exchange-a17781ba8d5f875b5150e524174c5f144aa6c0ba.zip | |
-more work on p2p payments and tests thereof
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_merge.c | 30 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_reserves_purse.c | 7 |
2 files changed, 22 insertions, 15 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c index 14dba5232..d87fb16de 100644 --- a/src/exchange/taler-exchange-httpd_purses_merge.c +++ b/src/exchange/taler-exchange-httpd_purses_merge.c @@ -226,19 +226,20 @@ merge_transaction (void *cls, bool no_kyc = true; bool no_reserve = true; - // FIXME: add KYC-check logic! - qs = TEH_plugin->do_purse_merge (TEH_plugin->cls, - pcc->purse_pub, - &pcc->merge_sig, - pcc->merge_timestamp, - &pcc->reserve_sig, - pcc->provider_url, - &pcc->reserve_pub, - &no_partner, - &no_balance, - &no_reserve, - &no_kyc, - &in_conflict); + qs = TEH_plugin->do_purse_merge ( + TEH_plugin->cls, + pcc->purse_pub, + &pcc->merge_sig, + pcc->merge_timestamp, + &pcc->reserve_sig, + pcc->provider_url, + &pcc->reserve_pub, + TEH_KYC_NONE != TEH_kyc_config.mode, + &no_partner, + &no_balance, + &no_reserve, + &no_kyc, + &in_conflict); if (qs < 0) { if (GNUNET_DB_STATUS_SOFT_ERROR == qs) @@ -270,7 +271,8 @@ merge_transaction (void *cls, NULL); return GNUNET_DB_STATUS_HARD_ERROR; } - if (no_kyc) + if ( (no_kyc) && + (TEH_KYC_NONE != TEH_kyc_config.mode) ) { *mhd_ret = TALER_MHD_REPLY_JSON_PACK ( diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c index f56852d53..44f3e85c3 100644 --- a/src/exchange/taler-exchange-httpd_reserves_purse.c +++ b/src/exchange/taler-exchange-httpd_reserves_purse.c @@ -301,6 +301,9 @@ purse_transaction (void *cls, bool no_reserve = true; bool no_kyc = true; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Creating purse with flags %d\n", + rpc->flags); qs = TEH_plugin->do_reserve_purse ( TEH_plugin->cls, &rpc->purse_pub, @@ -312,6 +315,7 @@ purse_transaction (void *cls, ? NULL : &rpc->gf->fees.purse, rpc->reserve_pub, + TEH_KYC_NONE != TEH_kyc_config.mode, &in_conflict, &no_reserve, &no_kyc, @@ -387,7 +391,8 @@ purse_transaction (void *cls, TALER_EC_EXCHANGE_GENERIC_RESERVE_UNKNOWN)); return GNUNET_DB_STATUS_HARD_ERROR; } - if (no_kyc) + if ( (no_kyc) && + (TEH_KYC_NONE != TEH_kyc_config.mode) ) { *mhd_ret = TALER_MHD_REPLY_JSON_PACK ( |