[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (ccf9f05e -> d1bf2692)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (ccf9f05e -> d1bf2692) |
|
Date: |
Wed, 01 Apr 2020 23:12:03 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from ccf9f05e scope clean up
new 5b78fbc6 better types/scoping/indentation
new d1bf2692 typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/exchange/taler-exchange-httpd_deposit.c | 2 +-
src/exchange/taler-exchange-httpd_melt.c | 2 +-
.../taler-exchange-httpd_refreshes_reveal.c | 4 +-
src/exchange/taler-exchange-httpd_refund.c | 6 +--
src/include/taler_error_codes.h | 55 ++++++++++++++++------
src/lib/exchange_api_common.c | 6 +--
6 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_deposit.c
b/src/exchange/taler-exchange-httpd_deposit.c
index 3ce46b2c..193101c0 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -436,7 +436,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
- TALER_EC_DEPOSIT_CURRENCY_MISSMATCH,
+ TALER_EC_DEPOSIT_CURRENCY_MISMATCH,
"contribution");
}
/* check coin signature */
diff --git a/src/exchange/taler-exchange-httpd_melt.c
b/src/exchange/taler-exchange-httpd_melt.c
index 9bff205c..f5bd0b5a 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -548,7 +548,7 @@ check_for_denomination_key (struct MHD_Connection
*connection,
TEH_KS_release (key_state);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
- TALER_EC_MELT_CURRENCY_MISSMATCH,
+ TALER_EC_MELT_CURRENCY_MISMATCH,
"value_with_fee");
}
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index 7496de01..b7db0a4b 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -837,7 +837,7 @@ handle_refreshes_reveal_json (struct MHD_Connection
*connection,
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
-
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISSMATCH,
+
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH,
"new_denoms/coin_evs");
}
if (json_array_size (new_denoms_h_json) !=
@@ -846,7 +846,7 @@ handle_refreshes_reveal_json (struct MHD_Connection
*connection,
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
-
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISSMATCH,
+
TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH,
"new_denoms/link_sigs");
}
diff --git a/src/exchange/taler-exchange-httpd_refund.c
b/src/exchange/taler-exchange-httpd_refund.c
index 0a9eede5..9fd9575f 100644
--- a/src/exchange/taler-exchange-httpd_refund.c
+++ b/src/exchange/taler-exchange-httpd_refund.c
@@ -258,7 +258,7 @@ refund_transaction (void *cls,
tl);
*mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_PRECONDITION_FAILED,
- TALER_EC_REFUND_CURRENCY_MISSMATCH,
+ TALER_EC_REFUND_CURRENCY_MISMATCH,
"currencies involved do not match");
return GNUNET_DB_STATUS_HARD_ERROR;
}
@@ -443,7 +443,7 @@ verify_and_execute_refund (struct MHD_Connection
*connection,
GNUNET_break_op (0);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
- TALER_EC_REFUND_FEE_CURRENCY_MISSMATCH,
+ TALER_EC_REFUND_FEE_CURRENCY_MISMATCH,
"refund_fee");
}
{
@@ -535,7 +535,7 @@ TEH_handler_refund (struct MHD_Connection *connection,
GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (connection,
MHD_HTTP_BAD_REQUEST,
- TALER_EC_REFUND_FEE_CURRENCY_MISSMATCH,
+ TALER_EC_REFUND_FEE_CURRENCY_MISMATCH,
"refund_amount or refund_fee");
}
if (-1 == TALER_amount_cmp (&refund.details.refund_amount,
diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h
index 626f9a9f..5baf9538 100644
--- a/src/include/taler_error_codes.h
+++ b/src/include/taler_error_codes.h
@@ -549,7 +549,7 @@ enum TALER_ErrorCode
* currency of the coin. This response is provided with HTTP status
* code #MHD_HTTP_PRECONDITION_FAILED.
*/
- TALER_EC_DEPOSIT_CURRENCY_MISSMATCH = 1222,
+ TALER_EC_DEPOSIT_CURRENCY_MISMATCH = 1222,
/**
* The respective coin did not have sufficient residual value for the
@@ -636,7 +636,7 @@ enum TALER_ErrorCode
* currency of the coin. This response is provided with HTTP status
* code #MHD_HTTP_PRECONDITION_FAILED.
*/
- TALER_EC_MELT_CURRENCY_MISSMATCH = 1311,
+ TALER_EC_MELT_CURRENCY_MISMATCH = 1311,
/**
* The exchange is unaware of the denomination key that was used to
@@ -726,7 +726,7 @@ enum TALER_ErrorCode
* denomination keys given. This response is provided with HTTP status
* code #MHD_HTTP_BAD_REQUEST.
*/
- TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISSMATCH = 1378,
+ TALER_EC_REVEAL_NEW_DENOMS_ARRAY_SIZE_MISMATCH = 1378,
/**
* The exchange encountered a numeric overflow totaling up the cost
@@ -821,7 +821,7 @@ enum TALER_ErrorCode
* currency of the coin. This response is provided with HTTP status
* code #MHD_HTTP_PRECONDITION_FAILED.
*/
- TALER_EC_REFUND_CURRENCY_MISSMATCH = 1504,
+ TALER_EC_REFUND_CURRENCY_MISMATCH = 1504,
/**
* When we tried to check if we already paid out the coin, the
@@ -874,7 +874,7 @@ enum TALER_ErrorCode
* amount. This response is provided with HTTP status code
* #MHD_HTTP_BAD_REQUEST.
*/
- TALER_EC_REFUND_FEE_CURRENCY_MISSMATCH = 1511,
+ TALER_EC_REFUND_FEE_CURRENCY_MISMATCH = 1511,
/**
* The refunded amount is smaller than the refund fee, which would
@@ -1155,7 +1155,7 @@ enum TALER_ErrorCode
/**
* There was an integer overflow totaling up the amounts or deposit
* fees in the payment. This response is provided with HTTP status
- * code #MHD_HTTP_BAD_REQUEST.
+ * code #MHD_HTTP_INTERNAL_SERVER_ERROR.
*/
TALER_EC_PAY_AMOUNT_OVERFLOW = 2106,
@@ -1190,7 +1190,7 @@ enum TALER_ErrorCode
/**
* We failed to contact the exchange for the /pay request. This
* response is provided with HTTP status code
- * #MHD_HTTP_SERVICE_UNAVAILABLE.
+ * #MHD_HTTP_REQUEST_TIMEOUT.
*/
TALER_EC_PAY_EXCHANGE_TIMEOUT = 2111,
@@ -1243,7 +1243,7 @@ enum TALER_ErrorCode
/**
* The exchange failed to provide a valid response to the merchant's
* /keys request. This response is provided with HTTP status code
- * #MHD_HTTP_SERVICE_UNAVAILABLE.
+ * #MHD_HTTP_FAILED_DEPENDENDCY.
*/
TALER_EC_PAY_EXCHANGE_KEYS_FAILURE = 2120,
@@ -1278,7 +1278,7 @@ enum TALER_ErrorCode
* fee. This response is provided with HTTP status code of
* #MHD_HTTP_INTERNAL_SERVER_ERROR.
*/
- TALER_EC_PAY_WIRE_FEE_CURRENCY_MISSMATCH = 2125,
+ TALER_EC_PAY_WIRE_FEE_CURRENCY_MISMATCH = 2125,
/**
* The merchant refuses to abort and refund the payment operation as
@@ -1290,10 +1290,37 @@ enum TALER_ErrorCode
/**
* A unknown merchant public key was included in the payment. That
* happens typically when the wallet sends the payment to the wrong
- * merchant instance.
+ * merchant instance. This response is provided with an HTTP status
+ * code of #MHD_HTTP_NOT_FOUND.
*/
TALER_EC_PAY_WRONG_INSTANCE = 2127,
+ /**
+ * The exchange failed to give us a response when we asked for /keys.
+ * This response is provided with HTTP status code
+ * #MHD_HTTP_FAILED_DEPENDENCY.
+ */
+ TALER_EC_PAY_EXCHANGE_HAS_NO_KEYS = 2128,
+
+ /**
+ * The deposit time for the denomination has expired. This response is
+ * provided with HTTP status code #MHD_HTTP_GONE.
+ */
+ TALER_EC_PAY_DENOMINATION_DEPOSIT_EXPIRED = 2129,
+
+ /**
+ * The proposal is not known to the backend. This response is provided
+ * with an HTTP status code of #MHD_HTTP_NOT_FOUND.
+ */
+ TALER_EC_PAY_PROPOSAL_NOT_FOUND = 2130,
+
+ /**
+ * The exchange of the deposited coin charges a wire fee that could
+ * not be added to the total (total amount too high). This response
+ * is provided with HTTP status code #MHD_HTTP_INTERNAL_SERVER_ERROR.
+ */
+ TALER_EC_PAY_EXCHANGE_WIRE_FEE_ADDITION_FAILED = 2131,
+
/**
* Integer overflow with specified timestamp argument detected. This
* response is provided with HTTP status code #MHD_HTTP_BAD_REQUEST.
@@ -1552,13 +1579,13 @@ enum TALER_ErrorCode
/**
* The reserve that was used to fund the tips has expired. Returned
- * with an HTTP status code of "not found".
+ * with an HTTP status code of #MHD_HTTP_NOT_FOUND.
*/
TALER_EC_TIP_AUTHORIZE_RESERVE_EXPIRED = 2702,
/**
* The reserve that was used to fund the tips was not found in the DB.
- * Returned with an HTTP status code of "not found".
+ * Returned with an HTTP status code of #MHD_HTTP_NOT_FOUND.
*/
TALER_EC_TIP_AUTHORIZE_RESERVE_UNKNOWN = 2703,
@@ -1611,7 +1638,7 @@ enum TALER_ErrorCode
* The backend got a reserve with a currency that does not match the
* backend's currency.
*/
- TALER_EC_TIP_QUERY_RESERVE_CURRENCY_MISSMATCH = 2711,
+ TALER_EC_TIP_QUERY_RESERVE_CURRENCY_MISMATCH = 2711,
/**
* The backend got a reserve history with amounts it cannot process
@@ -1650,7 +1677,7 @@ enum TALER_ErrorCode
/**
* The tip ID is unknown. This could happen if the tip has expired.
- * Returned with an HTTP status code of "not found".
+ * Returned with an HTTP status code of #MHD_HTTP_NOT_FOUND.
*/
TALER_EC_TIP_PICKUP_TIP_ID_UNKNOWN = 2800,
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c
index 661c68c6..5c56f527 100644
--- a/src/lib/exchange_api_common.c
+++ b/src/lib/exchange_api_common.c
@@ -56,7 +56,6 @@ TALER_EXCHANGE_parse_reserve_history (
unsigned int uuid_off;
struct TALER_Amount total_in;
struct TALER_Amount total_out;
- size_t off;
GNUNET_assert (GNUNET_OK ==
TALER_amount_get_zero (currency,
@@ -65,13 +64,14 @@ TALER_EXCHANGE_parse_reserve_history (
TALER_amount_get_zero (currency,
&total_out));
uuid_off = 0;
- for (off = 0; off<history_length; off++)
+ for (unsigned int off = 0; off<history_length; off++)
{
json_t *transaction;
struct TALER_Amount amount;
const char *type;
struct GNUNET_JSON_Specification hist_spec[] = {
- GNUNET_JSON_spec_string ("type", &type),
+ GNUNET_JSON_spec_string ("type",
+ &type),
TALER_JSON_spec_amount ("amount",
&amount),
/* 'wire' and 'signature' are optional depending on 'type'! */
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (ccf9f05e -> d1bf2692),
gnunet <=