[GNUnet-SVN] [taler-api] 02/02: fix typo

[gnunet]

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

dold pushed a commit to branch master
in repository api.

commit 12447106f6c29ffdb2e5d4ee7fd3abe09a1d117d
Merge: ad18330 fd0e526
Author: Florian Dold <address@hidden>
AuthorDate: Sat Dec 9 03:33:05 2017 +0100

    fix typo

 api-bank.rst                          | 178 ++++++++++++++++++++++++++++------
 api-common.rst                        |  11 +++
 api-exchange.rst                      | 141 +++++++++------------------
 api-merchant.rst                      |  81 +++++++++++-----
 conf.py                               |   4 +-
 exts/__pycache__/tsref.cpython-35.pyc | Bin 7463 -> 7453 bytes
 index.rst                             |   2 +-
 7 files changed, 259 insertions(+), 158 deletions(-)

diff --cc api-exchange.rst
index f2af78c,a4efd43..507eb56
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@@ -918,17 -900,24 +900,24 @@@ the API during normal operation
    .. code-block:: tsref
  
      interface RevealRequest {
-       // Hash over most of the arguments to the /exchange/melt step.  Used to
-       // identify the corresponding melt operation.  For details on which 
elements
-       // must be hashed in which order, please consult the source code of the 
exchange
-       // reference implementation.
-       session_hash: HashCode;
- 
-       // Array of `kappa - 1` ECDHE transfer private keys.
-       // The exchange will use those to decrypt the transfer secrets,
-       // and then decrypt the private keys and blinding factors
-       // of the coins to be generated and check all this against the 
commitments.
+ 
+       // Array of `n` new hash codes of denomination public keys to order.
+       new_denoms_h: HashCode[];
+ 
+       // Array of `n` entries with blinded coins,
+       // matching the respective entries in `new_denoms`.
+       coin_evs: CoinEnvelope[];
+ 
+       // `kappa - 1` transfer private keys (ephemeral ECDHE keys)
        transfer_privs: EddsaPrivateKey[];
+ 
 -      // transfer public keys at the `noreveal_index`.
 -      transfer_pub: EddsaPublicKey[];
++      // transfer public key at the `noreveal_index`.
++      transfer_pub: EddsaPublicKey;
+ 
+       // The original commitment, used to match the /refresh/reveal
+       // to the corresponding /refresh/melt operation.
+       rc: TALER_RefreshCommitmentP;
+ 
      }
  
  
diff --cc api-merchant.rst
index abee1d5,996bbb3..6330f3c
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@@ -310,14 -298,10 +308,18 @@@ The following API are made available b
    .. _RefundLookup:
    .. code-block:: tsref
  
++<<<<<<< HEAD
 +    interface RefundLookupResponse {
 +      refund_permissions: RefundPermission[];
 +    }
 +    
 +    interface RefundPermission {
++=======
+     interface RefundLookup {
++>>>>>>> fd0e5260107f6c418659808b2620484332afd774
  
        // Coin from which the refund is going to be taken
-       coin_pub: EddsaPublicKey;     
+       coin_pub: EddsaPublicKey;
  
        // Refund amount taken from coin_pub
        refund_amount: Amount;

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