[taler-docs] branch master updated: specify error cases

[gnunet]

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

grothoff pushed a commit to branch master
in repository docs.

The following commit(s) were added to refs/heads/master by this push:
     new 66b0978  specify error cases
     new c6014d7  Merge branch 'master' of git+ssh://git.taler.net/docs
66b0978 is described below

commit 66b09780c1911e90c5b702f0374ef71dfbaa9f8a
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon May 18 19:29:05 2020 +0200

    specify error cases
---
 core/api-merchant.rst | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index d1563da..ea1750c 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1370,9 +1370,7 @@ Tracking Wire Transfers
 
   :status 200 OK:
     The wire transfer is known to the exchange, details about it follow in the 
body.
-    The body of the response is a `TrackTransferResponse`.  Note that
-    the similarity to the response given by the exchange for a "GET /transfer"
-    is completely intended.
+    The body of the response is a `TrackTransferResponse`.
   :status 202 Accepted:
     The exchange provided conflicting information about the transfer. Namely,
     there is at least one deposit among the deposits aggregated by ``wtid``
@@ -1411,7 +1409,7 @@ Tracking Wire Transfers
       payto_uri: string;
 
       // base URL of the exchange that made the wire transfer
-      exchange: string;
+      exchange_url: string;
     }
 
   .. ts:def:: TrackTransferResponse
@@ -1592,6 +1590,11 @@ Tracking Wire Transfers
       // False if we have an answer and are unhappy, missing if we
       // do not have an answer from the exchange.
       verified?: boolean;
+
+      // True if the merchant uses the POST /transfer API to confirm
+      // that this wire transfer took place (and it is thus not
+      // something merely claimed by the exchange).
+      confirmed?: boolean;
     }
 
 
@@ -1621,6 +1624,8 @@ Giving Customer Tips
   :status 200 OK:
     The backend is waiting for the reserve to be established. The merchant
     must now perform the wire transfer indicated in the 
`ReserveCreateConfirmation`.
+  :status 409 Conflict:
+    The exchange does not support the requested wire method.
   :status 424 Failed Dependency:
     We could not obtain /wire details from the specified exchange base URL.
 
@@ -1628,10 +1633,13 @@ Giving Customer Tips
 
     interface ReserveCreateRequest {
       // Amount that the merchant promises to put into the reserve
-      initial_amount: Amount;
+      initial_balance: Amount;
 
       // Exchange the merchant intends to use for tipping
-      exchange_base_url: string;
+      exchange_url: string;
+
+      // Desired wire method, for example "iban" or "x-taler-bank"
+      wire_method: string;
 
     }
 

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