1 files changed, 6 insertions, 12 deletions
diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index d5edcff5..5aa5522c 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -1648,19 +1648,15 @@ struct TALER_MERCHANT_OrderAbortHandle;
 struct TALER_MERCHANT_AbortedCoin
 {
   /**
-   * Merchant signature affirming the refund.
+   * Exchange signature affirming the refund.
    */
-  struct TALER_MerchantSignatureP merchant_sig;
+  struct TALER_ExchangeSignatureP exchange_sig;
 
   /**
-   * Public key of the refunded coin.
+   * Exchange public key affirming the refund.
    */
-  struct TALER_CoinSpendPublicKeyP coin_pub;
+  struct TALER_ExchangePublicKeyP exchange_pub;
 
-  /**
-   * Refund transaction ID.
-   */
-  uint64_t rtransaction_id;
 };
 
 
@@ -1671,16 +1667,14 @@ struct TALER_MERCHANT_AbortedCoin
  * @param cls closure
  * @param hr HTTP response details
  * @param merchant_pub public key of the merchant
- * @param h_contract hash of the contract
  * @param num_aborts size of the @a res array, 0 on errors
  * @param aborts merchant signatures refunding coins, NULL on errors
  */
 typedef void
-(*TALER_MERCHANT_PayAbortCallback) (
+(*TALER_MERCHANT_AbortCallback) (
   void *cls,
   const struct TALER_MERCHANT_HttpResponse *hr,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
-  const struct GNUNET_HashCode *h_contract,
   unsigned int num_aborts,
   const struct TALER_MERCHANT_AbortedCoin aborts[]);
 
@@ -1726,7 +1720,7 @@ TALER_MERCHANT_order_abort (struct GNUNET_CURL_Context *ctx,
                             const char *order_id,
                             unsigned int num_coins,
                             const struct TALER_MERCHANT_PayCoin coins[],
-                            TALER_MERCHANT_PayAbortCallback cb,
+                            TALER_MERCHANT_AbortCallback cb,
                             void *cb_cls);