From dccf016e736e1a1f3fa004669c04c11bc8505cd0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 27 Oct 2016 19:54:43 +0200 Subject: update status codes to reflect actual current implementation --- api-merchant.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'api-merchant.rst') 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`_. -- cgit v1.2.3