commit 4d249f029aba0179bfce197d23d66b0269b180d4 parent 97abec25f720f56d994c55271ee3890f94b7c2a2 Author: Marcello Stanisci <marcello.stanisci@inria.fr> Date: Tue, 1 Nov 2016 15:06:24 +0100 moving paragraph Diffstat:
| M | api-merchant.rst | | | 9 | +++++---- |
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/api-merchant.rst b/api-merchant.rst @@ -242,8 +242,9 @@ 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 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`_. + :status 424 Failed Dependency: The exchange provided conflicting information about the transfer. + The response body contains the `TrackTransferConflictDetails`_. + **Details:** @@ -310,8 +311,8 @@ 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 424 Failed Dependency: The exchange provided conflicting information about the transfer. - The response body contains the `TrackTransferConflictDetails`_. + :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:**