[taler-taler-util] branch master updated: address EC FIXMEs

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-util.

The following commit(s) were added to refs/heads/master by this push:
     new 9dff7df  address EC FIXMEs
9dff7df is described below

commit 9dff7df613673721a1027d42ba8ca368bf7e0a02
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 17 21:53:26 2020 +0100

    address EC FIXMEs
---
 taler/util/errorcodes.py | 86 ++++++++----------------------------------------
 1 file changed, 13 insertions(+), 73 deletions(-)

diff --git a/taler/util/errorcodes.py b/taler/util/errorcodes.py
index dcc3e0a..1eb8805 100644
--- a/taler/util/errorcodes.py
+++ b/taler/util/errorcodes.py
@@ -530,14 +530,13 @@ ec._add_ec(
     "DEPOSIT_DENOMINATION_KEY_UNKNOWN",
     1204,
     """
-    The exchange database is unaware of the denomination key that
-    signed the coin (however, the exchange process is; this is not
-    supposed to happen; it can happen if someone decides to purge the
-    DB behind the back of the exchange process).  Hence the deposit
+    The exchange was trying to lookup the denomination key for
+    the purpose of a DEPOSIT operation. However, the denomination
+    key is unavailable for that purpose. This can be because
+    it is entirely unknown to the exchange or not in the validity
+    period for the deposit operation.  Hence the deposit
     is being refused.  This response is provided with HTTP status
     code MHD_HTTP_NOT_FOUND.
-
-    FIXME: This is wrong / copy&paste error.
     """,
 )
 
@@ -597,11 +596,12 @@ ec._add_ec(
     1210,
     """
     The exchange failed to canonicalize and hash the given wire format.
-    This response is provided
-    with HTTP status code MHD_HTTP_BAD_REQUEST.
-
-    FIXME: The naming and description is weird,
-    as we don't really do JSON anymore for the wire details.
+    For example, the merchant failed to provide the "salt" or
+    a valid payto:// URI in the wire details.  Note that while the
+    exchange will do some basic sanity checking on the wire details,
+    it cannot warrant that the banking system will ultimately be able
+    to route to the specified address, even if this check passed.
+    This response is provided with HTTP status code MHD_HTTP_BAD_REQUEST.
     """,
 )
 
@@ -625,56 +625,6 @@ ec._add_ec(
     """,
 )
 
-ec._add_ec(
-    "DEPOSIT_INVALID_WIRE_FORMAT_SIGNATURE",
-    1214,
-    """
-    The signature over the given wire details is invalid.
-    This response is provided
-    with HTTP status code MHD_HTTP_BAD_REQUEST.
-
-    FIXME: Seems to be unused.
-    """,
-)
-
-ec._add_ec(
-    "DEPOSIT_INVALID_WIRE_FORMAT_BANK",
-    1215,
-    """
-    The bank specified in the wire transfer format is not supported
-    by this exchange.
-    This response is provided
-    with HTTP status code MHD_HTTP_BAD_REQUEST.
-
-    FIXME: Seems to be unused.
-    """,
-)
-
-ec._add_ec(
-    "DEPOSIT_INVALID_WIRE_FORMAT_TYPE_MISSING",
-    1216,
-    """
-    No wire format type was specified in the JSON wire format
-    details.
-    This response is provided
-    with HTTP status code MHD_HTTP_BAD_REQUEST.
-
-    FIXME: Seems to be unused.
-    """,
-)
-
-ec._add_ec(
-    "DEPOSIT_INVALID_WIRE_FORMAT_TYPE_UNSUPPORTED",
-    1217,
-    """
-    The given wire format type is not supported by this
-    exchange.
-    This response is provided
-    with HTTP status code MHD_HTTP_BAD_REQUEST.
-
-    FIXME: Seems to be unused.
-    """,
-)
 
 ec._add_ec(
     "DEPOSIT_INVALID_TIMESTAMP",
@@ -1452,16 +1402,6 @@ ec._add_ec(
     """,
 )
 
-ec._add_ec(
-    "CONTRACT_INSTANCE_INCONSISTENT",
-    2001,
-    """
-    The frontend specified two different instances within
-    the same order: one in the top level, and the other one
-    within the 'merchant' object.
-    FIXME: hopefully this one is now obsolete?
-    """,
-)
 
 ec._add_ec(
     "PROPOSAL_INSTANCE_CONFIGURATION_LACKS_WIRE",
@@ -1936,7 +1876,7 @@ ec._add_ec(
     The exchange gave conflicting information about a coin which has
     been wire transferred.
     The response is provided with HTTP status code
-    MHD_HTTP_INTERNAL_SERVER_ERROR (FIXME: bad choice!).
+    MHD_HTTP_FAILED_DEPENDENCY.
     """,
 )
 
@@ -1955,7 +1895,7 @@ ec._add_ec(
     The exchange charged a different wire fee than what it
     originally advertised, and it is higher.  The response
     is provied with an HTTP status of
-    MHD_HTTP_INTERNAL_SERVER_ERROR (FIXME: bad choice!).
+    MHD_HTTP_BAD_DEPENDENCY.
     """,
 )
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.