diff options
| -rw-r--r-- | contrib/taler-exchange.tag | 18 | ||||
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 3 | ||||
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 13 |
3 files changed, 16 insertions, 18 deletions
diff --git a/contrib/taler-exchange.tag b/contrib/taler-exchange.tag index 0f1e2fdf..8a90302c 100644 --- a/contrib/taler-exchange.tag +++ b/contrib/taler-exchange.tag @@ -44,7 +44,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_INVALID_RESPONSE</name> + <name>TALER_EC_GENERIC_INVALID_RESPONSE</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -54,7 +54,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_RESERVE_EXPIRED</name> + <name>TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -64,7 +64,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_RESERVE_NOT_FOUND</name> + <name>TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -74,7 +74,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_INSUFFICIENT_FUNDS</name> + <name>TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -84,7 +84,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_DB_START_FAILURE</name> + <name>TALER_EC_GENERIC_DB_START_FAILED</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -94,7 +94,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_DB_LOOKUP_RESERVE_FAILURE</name> + <name>TALER_EC_GENERIC_DB_FETCH_FAILED</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -104,7 +104,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE</name> + <name>TALER_EC_GENERIC_DB_STORE_FAILED</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -114,7 +114,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_DB_RESERVE_INVARIANT_FAILURE</name> + <name>TALER_EC_GENERIC_DB_INVARIANT_FAILURE</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> @@ -124,7 +124,7 @@ <filename>taler_error_codes.h</filename> <member kind="function"> <type>enum TALER_ErrorCode</type> - <name>TALER_EC_TIP_AUTHORIZE_DB_SERIALIZATION_FAILURE</name> + <name>TALER_EC_GENERIC_DB_SOFT_FAILURE</name> <anchorfile>taler_error_codes.h</anchorfile> </member> </compound> diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index 6c87eea5..47147c07 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -5106,13 +5106,12 @@ lookup_reserve_for_tip_cb (void *cls, * @param[out] expiration set to when the tip expires * @return transaction status, * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED if the reserve is known but has expired - * #TALER_EC_TIP_AUTHORIZE_RESERVE_NOT_FOUND if the reserve is not known + * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND if the reserve is not known * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS if the reserve has insufficient funds left * #TALER_EC_GENERIC_DB_START_FAILED on hard DB errors * #TALER_EC_GENERIC_DB_FETCH_FAILED on hard DB errors * #TALER_EC_GENERIC_DB_STORE_FAILED on hard DB errors * #TALER_EC_GENERIC_DB_INVARIANT_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_START_FAILED on hard DB errors * #TALER_EC_GENERIC_DB_SOFT_FAILURE soft DB errors (client should retry) * #TALER_EC_NONE upon success */ diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 661e42dd..67c1c5c1 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -1874,14 +1874,13 @@ struct TALER_MERCHANTDB_Plugin * @param[out] expiration set to when the tip expires * @return transaction status, * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_EXPIRED if the reserve is known but has expired - * #TALER_EC_TIP_AUTHORIZE_RESERVE_NOT_FOUND if the reserve is not known + * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_RESERVE_NOT_FOUND if the reserve is not known * #TALER_EC_MERCHANT_PRIVATE_POST_TIP_AUTHORIZE_INSUFFICIENT_FUNDS if the reserve has insufficient funds left - * #TALER_EC_GENERIC_DB_START_FAILED__TIP_AUTHORIZE_DB_START_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_FETCH_FAILED__TIP_AUTHORIZE_DB_LOOKUP_RESERVE_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_STORE_FAILED__TIP_AUTHORIZE_DB_UPDATE_RESERVE_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_INVARIANT_FAILURE__TIP_AUTHORIZE_DB_RESERVE_INVARIANT_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_START_FAILED__TIP_AUTHORIZE_DB_START_FAILURE on hard DB errors - * #TALER_EC_GENERIC_DB_SOFT_FAILURE__TIP_AUTHORIZE_DB_SERIALIZATION_FAILURE on soft DB errors (client should retry) + * #TALER_EC_GENERIC_DB_START_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_FETCH_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_STORE_FAILED on hard DB errors + * #TALER_EC_GENERIC_DB_INVARIANT_FAILURE on hard DB errors + * #TALER_EC_GENERIC_DB_SOFT_FAILURE on soft DB errors (client should retry) * #TALER_EC_NONE upon success */ enum TALER_ErrorCode |