-work on p2p payments

2 files changed, 6 insertions, 4 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index a36007757..2a88c1014 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -4004,14 +4004,14 @@ struct TALER_EXCHANGE_ContractGetResponse
       struct TALER_PurseContractPublicKeyP purse_pub;
 
       /**
-       * Private key of the merge capability.
+       * Encrypted contract.
        */
-      struct TALER_PurseMergePrivateKeyP merge_priv;
+      const void *econtract;
 
       /**
-       * Contract terms.
+       * Number of bytes in @e econtract.
        */
-      const json_t *contract_terms;
+      size_t econtract_size;
 
     } success;
 
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index f8ad120d3..fb3b553ce 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -2417,6 +2417,7 @@ TALER_TESTING_cmd_purse_create_with_deposit (
  *
  * @param label command label
  * @param expected_http_status what HTTP status do we expect to get returned from the exchange
+ * @param for_merge true if for merge, false if for deposit
  * @param contract_ref reference to a command providing us with the contract private key
  * @return the command
  */
@@ -2424,6 +2425,7 @@ struct TALER_TESTING_Command
 TALER_TESTING_cmd_contract_get (
   const char *label,
   unsigned int expected_http_status,
+  bool for_merge,
   const char *contract_ref);