summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/auditor_api_deposit_confirmation.c2
-rw-r--r--src/lib/auditor_api_exchanges.c8
-rw-r--r--src/lib/auditor_api_handle.c8
-rw-r--r--src/lib/exchange_api_deposit.c10
-rw-r--r--src/lib/exchange_api_deposits_get.c8
-rw-r--r--src/lib/exchange_api_handle.c2
-rw-r--r--src/lib/exchange_api_link.c4
-rw-r--r--src/lib/exchange_api_melt.c18
-rw-r--r--src/lib/exchange_api_recoup.c19
-rw-r--r--src/lib/exchange_api_refreshes_reveal.c4
-rw-r--r--src/lib/exchange_api_refund.c8
-rw-r--r--src/lib/exchange_api_reserves_get.c4
-rw-r--r--src/lib/exchange_api_transfers_get.c4
-rw-r--r--src/lib/exchange_api_wire.c16
-rw-r--r--src/lib/exchange_api_withdraw.c2
-rw-r--r--src/lib/exchange_api_withdraw2.c6
16 files changed, 62 insertions, 61 deletions
diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c
index 1856a89f..ff65036e 100644
--- a/src/lib/auditor_api_deposit_confirmation.c
+++ b/src/lib/auditor_api_deposit_confirmation.c
@@ -96,7 +96,7 @@ handle_deposit_confirmation_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
hr.ec = TALER_EC_NONE;
diff --git a/src/lib/auditor_api_exchanges.c b/src/lib/auditor_api_exchanges.c
index a2e84f19..78f4d90e 100644
--- a/src/lib/auditor_api_exchanges.c
+++ b/src/lib/auditor_api_exchanges.c
@@ -98,7 +98,7 @@ handle_exchanges_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
ja = json_object_get (json,
@@ -107,7 +107,7 @@ handle_exchanges_finished (void *cls,
(! json_is_array (ja)) )
{
GNUNET_break (0);
- hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0;
break;
}
@@ -116,7 +116,7 @@ handle_exchanges_finished (void *cls,
if (ja_len > MAX_EXCHANGES)
{
GNUNET_break (0);
- hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0;
break;
}
@@ -141,7 +141,7 @@ handle_exchanges_finished (void *cls,
{
GNUNET_break_op (0);
ok = GNUNET_NO;
- hr.ec = TALER_EC_AUDITOR_EXCHANGES_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0;
break;
}
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index 5a293584..d3cecf75 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -212,7 +212,7 @@ decode_version_json (const json_t *resp_obj,
if (JSON_OBJECT != json_typeof (resp_obj))
{
GNUNET_break_op (0);
- return TALER_EC_JSON_INVALID;
+ return TALER_EC_GENERIC_JSON_INVALID;
}
/* check the version */
if (GNUNET_OK !=
@@ -221,7 +221,7 @@ decode_version_json (const json_t *resp_obj,
NULL, NULL))
{
GNUNET_break_op (0);
- return TALER_EC_JSON_INVALID;
+ return TALER_EC_GENERIC_JSON_INVALID;
}
if (3 != sscanf (ver,
"%u:%u:%u",
@@ -230,7 +230,7 @@ decode_version_json (const json_t *resp_obj,
&age))
{
GNUNET_break_op (0);
- return TALER_EC_VERSION_MALFORMED;
+ return TALER_EC_GENERIC_VERSION_MALFORMED;
}
auditor->version = GNUNET_strdup (ver);
vi->version = auditor->version;
@@ -307,7 +307,7 @@ version_completed_cb (void *cls,
GNUNET_break_op (0);
TALER_LOG_WARNING ("NULL body for a 200-OK /version\n");
hr.http_status = 0;
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
}
hr.ec = decode_version_json (resp_obj,
diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 51783dbb..7bb083ef 100644
--- a/src/lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -274,7 +274,7 @@ verify_deposit_signature_conflict (
ec = TALER_JSON_get_error_code (json);
switch (ec)
{
- case TALER_EC_DEPOSIT_INSUFFICIENT_FUNDS:
+ case TALER_EC_EXCHANGE_DEPOSIT_INSUFFICIENT_FUNDS:
if (0 >
TALER_amount_add (&total,
&total,
@@ -294,7 +294,7 @@ verify_deposit_signature_conflict (
}
/* everything OK, proof of double-spending was provided */
return GNUNET_OK;
- case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY:
+ case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 != GNUNET_memcmp (&dh->dki.h_key,
&h_denom_pub))
return GNUNET_OK; /* indeed, proof with different denomination key provided */
@@ -336,7 +336,7 @@ handle_deposit_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -347,7 +347,7 @@ handle_deposit_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
}
else
{
@@ -369,7 +369,7 @@ handle_deposit_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_DEPOSIT_INVALID_SIGNATURE_BY_EXCHANGE;
}
else
{
diff --git a/src/lib/exchange_api_deposits_get.c b/src/lib/exchange_api_deposits_get.c
index 8cb9c3ff..d5b2395a 100644
--- a/src/lib/exchange_api_deposits_get.c
+++ b/src/lib/exchange_api_deposits_get.c
@@ -142,7 +142,7 @@ handle_deposit_wtid_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
{
@@ -163,7 +163,7 @@ handle_deposit_wtid_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_DEPOSITS_INVALID_BODY_BY_EXCHANGE;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
dwh->depconf.execution_time = GNUNET_TIME_absolute_hton (
@@ -178,7 +178,7 @@ handle_deposit_wtid_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_DEPOSITS_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_DEPOSITS_GET_INVALID_SIGNATURE_BY_EXCHANGE;
}
else
{
@@ -207,7 +207,7 @@ handle_deposit_wtid_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_DEPOSITS_INVALID_BODY_BY_EXCHANGE;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
else
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 75b63abc..4d8f0d03 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1326,7 +1326,7 @@ keys_completed_cb (void *cls,
{
TALER_LOG_ERROR ("Could not decode /keys response\n");
hr.http_status = 0;
- hr.ec = TALER_EC_KEYS_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
for (unsigned int i = 0; i<kd.num_auditors; i++)
{
struct TALER_EXCHANGE_AuditorInformation *anew = &kd.auditors[i];
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c
index e6f54604..383efba5 100644
--- a/src/lib/exchange_api_link.c
+++ b/src/lib/exchange_api_link.c
@@ -364,7 +364,7 @@ handle_link_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -373,7 +373,7 @@ handle_link_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_LINK_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
GNUNET_assert (NULL == lh->link_cb);
diff --git a/src/lib/exchange_api_melt.c b/src/lib/exchange_api_melt.c
index 72a90dc3..b89443c8 100644
--- a/src/lib/exchange_api_melt.c
+++ b/src/lib/exchange_api_melt.c
@@ -282,7 +282,7 @@ verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
ec = TALER_JSON_get_error_code (json);
switch (ec)
{
- case TALER_EC_MELT_INSUFFICIENT_FUNDS:
+ case TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS:
/* check if melt operation was really too expensive given history */
if (0 >
TALER_amount_add (&total,
@@ -304,7 +304,7 @@ verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh,
/* everything OK, valid proof of double-spending was provided */
return GNUNET_OK;
- case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY:
+ case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 != GNUNET_memcmp (&mh->dki.h_key,
&h_denom_pub))
return GNUNET_OK; /* indeed, proof with different denomination key provided */
@@ -345,7 +345,7 @@ handle_melt_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -356,7 +356,7 @@ handle_melt_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
}
if (NULL != mh->melt_cb)
{
@@ -379,7 +379,7 @@ handle_melt_finished (void *cls,
hr.ec = TALER_JSON_get_error_code (j);
switch (hr.ec)
{
- case TALER_EC_MELT_INSUFFICIENT_FUNDS:
+ case TALER_EC_EXCHANGE_MELT_INSUFFICIENT_FUNDS:
/* Double spending; check signatures on transaction history */
if (GNUNET_OK !=
verify_melt_signature_spend_conflict (mh,
@@ -387,25 +387,25 @@ handle_melt_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j);
}
break;
- case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY:
+ case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (GNUNET_OK !=
verify_melt_signature_denom_conflict (mh,
j))
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j);
}
break;
default:
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_MELT_INVALID_SIGNATURE_BY_EXCHANGE;
hr.hint = TALER_JSON_get_error_hint (j);
break;
}
diff --git a/src/lib/exchange_api_recoup.c b/src/lib/exchange_api_recoup.c
index d8c59827..72d94634 100644
--- a/src/lib/exchange_api_recoup.c
+++ b/src/lib/exchange_api_recoup.c
@@ -162,7 +162,7 @@ handle_recoup_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -170,7 +170,7 @@ handle_recoup_finished (void *cls,
j))
{
GNUNET_break_op (0);
- hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0;
break;
}
@@ -204,7 +204,7 @@ handle_recoup_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
}
else
{
@@ -214,7 +214,7 @@ handle_recoup_finished (void *cls,
ec = TALER_JSON_get_error_code (j);
switch (ec)
{
- case TALER_EC_RECOUP_COIN_BALANCE_ZERO:
+ case TALER_EC_EXCHANGE_RECOUP_COIN_BALANCE_ZERO:
if (0 > TALER_amount_cmp (&total,
&dki->value))
{
@@ -224,20 +224,21 @@ handle_recoup_finished (void *cls,
exchange is here. We should look at the key
structure of ph->exchange, and find the smallest
_currently withdrawable_ denomination and check
- if the value remaining would suffice... */GNUNET_break_op (0);
+ if the value remaining would suffice... *///
+ GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
break;
- case TALER_EC_COIN_CONFLICTING_DENOMINATION_KEY:
+ case TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY:
if (0 == GNUNET_memcmp (&ph->pk.h_key,
&h_denom_pub))
{
/* invalid proof provided */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
/* valid error from exchange */
@@ -245,7 +246,7 @@ handle_recoup_finished (void *cls,
default:
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_RECOUP_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
ph->cb (ph->cb_cls,
diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c
index 6ffbb9a3..642ed6c9 100644
--- a/src/lib/exchange_api_refreshes_reveal.c
+++ b/src/lib/exchange_api_refreshes_reveal.c
@@ -211,7 +211,7 @@ handle_refresh_reveal_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
{
@@ -225,7 +225,7 @@ handle_refresh_reveal_finished (void *cls,
if (GNUNET_OK != ret)
{
hr.http_status = 0;
- hr.ec = TALER_EC_REVEAL_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
}
else
{
diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c
index 55f71757..870f3afd 100644
--- a/src/lib/exchange_api_refund.c
+++ b/src/lib/exchange_api_refund.c
@@ -533,7 +533,7 @@ handle_refund_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -544,7 +544,7 @@ handle_refund_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_REFUND_INVALID_SIGNATURE_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_SIGNATURE_BY_EXCHANGE;
}
else
{
@@ -581,7 +581,7 @@ handle_refund_finished (void *cls,
{
GNUNET_break (0);
hr.http_status = 0;
- hr.ec = TALER_EC_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
hr.hint = "conflict information provided by exchange is invalid";
break;
}
@@ -601,7 +601,7 @@ handle_refund_finished (void *cls,
{
GNUNET_break (0);
hr.http_status = 0;
- hr.ec = TALER_EC_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
+ hr.ec = TALER_EC_EXCHANGE_REFUND_INVALID_FAILURE_PROOF_BY_EXCHANGE;
hr.hint = "failed precondition proof returned by exchange is invalid";
break;
}
diff --git a/src/lib/exchange_api_reserves_get.c b/src/lib/exchange_api_reserves_get.c
index 236cc0c7..3332a165 100644
--- a/src/lib/exchange_api_reserves_get.c
+++ b/src/lib/exchange_api_reserves_get.c
@@ -182,7 +182,7 @@ handle_reserves_get_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -190,7 +190,7 @@ handle_reserves_get_finished (void *cls,
j))
{
hr.http_status = 0;
- hr.ec = TALER_EC_RESERVE_STATUS_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
}
break;
case MHD_HTTP_BAD_REQUEST:
diff --git a/src/lib/exchange_api_transfers_get.c b/src/lib/exchange_api_transfers_get.c
index c9b0640a..e5bb17a8 100644
--- a/src/lib/exchange_api_transfers_get.c
+++ b/src/lib/exchange_api_transfers_get.c
@@ -276,7 +276,7 @@ handle_transfers_get_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK ==
@@ -284,7 +284,7 @@ handle_transfers_get_finished (void *cls,
j))
return;
GNUNET_break_op (0);
- hr.ec = TALER_EC_TRANSFERS_GET_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
hr.http_status = 0;
break;
case MHD_HTTP_BAD_REQUEST:
diff --git a/src/lib/exchange_api_wire.c b/src/lib/exchange_api_wire.c
index fec2b990..f70c0086 100644
--- a/src/lib/exchange_api_wire.c
+++ b/src/lib/exchange_api_wire.c
@@ -219,7 +219,7 @@ handle_wire_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
{
@@ -242,7 +242,7 @@ handle_wire_finished (void *cls,
/* bogus reply */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
if (0 == (num_accounts = json_array_size (accounts)))
@@ -251,7 +251,7 @@ handle_wire_finished (void *cls,
GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
if (NULL == (fm = parse_fees (fees)))
@@ -260,7 +260,7 @@ handle_wire_finished (void *cls,
GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
@@ -289,7 +289,7 @@ handle_wire_finished (void *cls,
/* bogus reply */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_SIGNATURE_INVALID;
+ hr.ec = TALER_EC_EXCHANGE_WIRE_SIGNATURE_INVALID;
break;
}
if (GNUNET_OK !=
@@ -300,7 +300,7 @@ handle_wire_finished (void *cls,
/* bogus reply */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
if (NULL == (method = TALER_payto_get_method (wa->payto_uri)))
@@ -308,7 +308,7 @@ handle_wire_finished (void *cls,
/* bogus reply */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
if (NULL == (wa->fees = lookup_fee (fm,
@@ -317,7 +317,7 @@ handle_wire_finished (void *cls,
/* bogus reply */
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_SERVER_JSON_INVALID;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
GNUNET_free (method);
break;
}
diff --git a/src/lib/exchange_api_withdraw.c b/src/lib/exchange_api_withdraw.c
index 88b0b1f6..b96adacd 100644
--- a/src/lib/exchange_api_withdraw.c
+++ b/src/lib/exchange_api_withdraw.c
@@ -113,7 +113,7 @@ handle_reserve_withdraw_finished (
struct TALER_EXCHANGE_HttpResponse hrx = {
.reply = hr->reply,
.http_status = 0,
- .ec = TALER_EC_WITHDRAW_UNBLIND_FAILURE
+ .ec = TALER_EC_EXCHANGE_WITHDRAW_UNBLIND_FAILURE
};
wh->cb (wh->cb_cls,
diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c
index c51138d9..2b6b1a8f 100644
--- a/src/lib/exchange_api_withdraw2.c
+++ b/src/lib/exchange_api_withdraw2.c
@@ -254,7 +254,7 @@ handle_reserve_withdraw_finished (void *cls,
switch (response_code)
{
case 0:
- hr.ec = TALER_EC_INVALID_RESPONSE;
+ hr.ec = TALER_EC_GENERIC_INVALID_RESPONSE;
break;
case MHD_HTTP_OK:
if (GNUNET_OK !=
@@ -263,7 +263,7 @@ handle_reserve_withdraw_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_WITHDRAW_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
break;
}
GNUNET_assert (NULL == wh->cb);
@@ -284,7 +284,7 @@ handle_reserve_withdraw_finished (void *cls,
{
GNUNET_break_op (0);
hr.http_status = 0;
- hr.ec = TALER_EC_WITHDRAW_REPLY_MALFORMED;
+ hr.ec = TALER_EC_GENERIC_REPLY_MALFORMED;
}
else
{