summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/api-bank.rst2
-rw-r--r--core/api-wire.rst18
-rw-r--r--developers-manual.rst15
-rw-r--r--taler-bank-manual.rst9
4 files changed, 22 insertions, 22 deletions
diff --git a/core/api-bank.rst b/core/api-bank.rst
index 10eae9ad..79043be6 100644
--- a/core/api-bank.rst
+++ b/core/api-bank.rst
@@ -46,7 +46,7 @@ Withdrawing
:status 200 OK:
The withdrawal was correctly initiated, therefore the exchange received the
payment. A `BankTalerWithdrawResponse` object is returned.
- :status 406 Not Acceptable: the user does not have sufficient credit to fulfill their request.
+ :status 409 Conflict: the user does not have sufficient credit to fulfill their request.
:status 404 Not Found: The exchange wire details did not point to any valid bank account.
**Details**
diff --git a/core/api-wire.rst b/core/api-wire.rst
index c97beed4..9992be4c 100644
--- a/core/api-wire.rst
+++ b/core/api-wire.rst
@@ -52,8 +52,7 @@ Making Transactions
:status 200 OK:
The request has been correctly handled, so the funds have been transferred to
the recipient's account. The body is a `TransactionResponse`
- :status 400 Bad Request: The bank replies with a `BankError` object.
- :status 406 Not Acceptable: The request had wrong currency; the bank replies with a `BankError` object.
+ :status 400 Bad Request: The bank replies with an `ErrorDetail` object.
:status 409 Conflict:
A transaction with the same ``transaction_uid`` but different transaction details
has been submitted before.
@@ -103,18 +102,6 @@ Making Transactions
}
- .. ts:def:: BankError
-
- interface BankError {
-
- // Human readable explanation of the failure.
- error: string;
-
- // Numeric Taler error code (`TALER_ErrorCode`)
- ec: number;
- }
-
-
--------------------------------
Querying the transaction history
--------------------------------
@@ -168,7 +155,6 @@ Querying the transaction history
**Response**
:status 200 OK: JSON object whose field ``incoming_transactions`` is an array of type `IncomingBankTransaction`.
- :status 204 No content: in case no records exist for the targeted user.
.. ts:def:: IncomingBankTransaction
@@ -241,8 +227,6 @@ Querying the transaction history
:status 200 OK:
JSON object whose field ``outgoing_transactions`` is
an array of type `OutgoingBankTransaction`.
- :status 204 No content:
- in case no records exist for the query
.. ts:def:: OutgoingBankTransaction
diff --git a/developers-manual.rst b/developers-manual.rst
index 7e44771b..88671ec5 100644
--- a/developers-manual.rst
+++ b/developers-manual.rst
@@ -1043,3 +1043,18 @@ use when talking to end users or even system administrators.
withdrawal
operation by which a :term:`wallet` can convert funds from a reserve to
fresh coins
+
+ fakebank
+ FIXME: explain
+
+ LibEuFin
+ FIXME: explain
+
+ GNUnet
+ FIXME: explain
+
+ bank
+ FIXME: explain
+
+ wire gateway
+ FIXME: explain
diff --git a/taler-bank-manual.rst b/taler-bank-manual.rst
index bb64961a..16221441 100644
--- a/taler-bank-manual.rst
+++ b/taler-bank-manual.rst
@@ -48,10 +48,11 @@ be switched off during a production deployment.
The new user has been correctly registered.
:status 409 Conflict:
The username requested by the client is not available anymore.
- :status 406 Not Acceptable:
- Unacceptable characters were given for the username. See
- https://docs.djangoproject.com/en/2.2/ref/contrib/auth/#django.contrib.auth.models.User.username
- for the accepted character set.
+ :status 400 Bad Request:
+
+ * Unacceptable characters were given for the username. See
+ https://docs.djangoproject.com/en/2.2/ref/contrib/auth/#django.contrib.auth.models.User.username
+ for the accepted character set.
**Details**