diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-04-24 16:02:34 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-04-24 16:02:34 +0200 |
| commit | b671d6b25dd469c9065a28d4406f6883da83c4ea (patch) | |
| tree | ca34d9555ae283450cb3a0e5542931aed147728a /src/exchange/taler-exchange-httpd_purses_merge.c | |
| parent | aedd2014ec50e2b52cad76d9c40c218ed0c9ccfc (diff) | |
| download | exchange-b671d6b25dd469c9065a28d4406f6883da83c4ea.tar.gz exchange-b671d6b25dd469c9065a28d4406f6883da83c4ea.tar.bz2 exchange-b671d6b25dd469c9065a28d4406f6883da83c4ea.zip | |
get first p2p test to pass
Diffstat (limited to 'src/exchange/taler-exchange-httpd_purses_merge.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_purses_merge.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c index ee8a73756..e79c41d85 100644 --- a/src/exchange/taler-exchange-httpd_purses_merge.c +++ b/src/exchange/taler-exchange-httpd_purses_merge.c @@ -134,7 +134,7 @@ reply_merge_success (struct MHD_Connection *connection, enum TALER_ErrorCode ec; struct TALER_Amount merge_amount; - if (0 <= + if (0 < TALER_amount_cmp (&pcc->balance, &pcc->target_amount)) { @@ -144,8 +144,9 @@ reply_merge_success (struct MHD_Connection *connection, TALER_JSON_pack_amount ("balance", &pcc->balance)); } - if (0 == strcmp (pcc->provider_url, - TEH_base_url)) + if ( (NULL == pcc->provider_url) || + (0 == strcmp (pcc->provider_url, + TEH_base_url)) ) { /* wad fee is always zero if we stay at our own exchange */ merge_amount = pcc->target_amount; @@ -175,7 +176,9 @@ reply_merge_success (struct MHD_Connection *connection, pcc->purse_pub, &pcc->h_contract_terms, &pcc->reserve_pub, - pcc->provider_url, + (NULL != pcc->provider_url) + ? pcc->provider_url + : TEH_base_url, &pub, &sig))) { |