summaryrefslogtreecommitdiff
path: root/api-merchant.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-10-27 19:54:43 +0200
committerChristian Grothoff <christian@grothoff.org>2016-10-27 19:54:43 +0200
commitdccf016e736e1a1f3fa004669c04c11bc8505cd0 (patch)
tree6b40db4167c3246ef778fb5dc29e6f830a5469ca /api-merchant.rst
parent835509f59bd11234b0181693396ad40b5ff8e5fc (diff)
downloaddocs-dccf016e736e1a1f3fa004669c04c11bc8505cd0.tar.gz
docs-dccf016e736e1a1f3fa004669c04c11bc8505cd0.tar.bz2
docs-dccf016e736e1a1f3fa004669c04c11bc8505cd0.zip
update status codes to reflect actual current implementation
Diffstat (limited to 'api-merchant.rst')
-rw-r--r--api-merchant.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/api-merchant.rst b/api-merchant.rst
index 49d2d74a..b219e6c2 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -242,7 +242,7 @@ The following API are made available by the merchant's `backend` to the merchant
:status 404 Not Found:
The wire transfer identifier is unknown to the exchange.
- :status 409 Conflict:
+ :status 424 Failed Dependency:
The exchange previously claimed that a deposit was not included in a wire transfer, and now claims that it is. This means that the exchange is dishonest. The response contains the cryptographic proof that the exchange is misbehaving in the form of a `TransactionConflictProof`_.
**Details:**
@@ -295,7 +295,7 @@ The following API are made available by the merchant's `backend` to the merchant
:status 404 Not Found: The transaction is unknown to the backend.
- :status 409 Conflict: The exchange provided conflicting information about the transfer.
+ :status 424 Failed Dependency: The exchange provided conflicting information about the transfer.
The response body contains the `TrackTransferConflictDetails`_.