remove claim_token from insert_contract_terms and return it from lookup_order

1 files changed, 4 insertions, 4 deletions

diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 2eb94a65..0ba158b8 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -946,6 +946,8 @@ struct TALER_MERCHANTDB_Plugin
    * @param cls closure
    * @param instance_id instance to obtain order of
    * @param order_id order id used to perform the lookup
+   * @param[out] claim_token the claim token generated for the order,
+   *             NULL to only test if the order exists
    * @param[out] contract_terms where to store the retrieved contract terms,
    *             NULL to only test if the order exists
    * @return transaction status
@@ -954,6 +956,7 @@ struct TALER_MERCHANTDB_Plugin
   (*lookup_order)(void *cls,
                   const char *instance_id,
                   const char *order_id,
+                  struct TALER_ClaimTokenP *claim_token,
                   json_t **contract_terms);
 
 
@@ -1072,14 +1075,12 @@ struct TALER_MERCHANTDB_Plugin
    * contract terms (to be hashed), the creation_time and pay_deadline (to be
    * obtained from the merchant_orders table). The "session_id" should be
    * initially set to the empty string.  The "fulfillment_url" and "refund_deadline"
-   * must be extracted from @a contract_terms. This function will only
-   * succeed if @a claim_token matches the token created for the order.
+   * must be extracted from @a contract_terms.
    *
    * @param cls closure
    * @param instance_id instance's identifier
    * @param order_id order_id used to store
    * @param claim_token the token belonging to the order
-   * @param contract_terms contract to store
    * @return transaction status, #GNUNET_DB_STATUS_HARD_ERROR if @a contract_terms
    *          is malformed
    */
@@ -1087,7 +1088,6 @@ struct TALER_MERCHANTDB_Plugin
   (*insert_contract_terms)(void *cls,
                            const char *instance_id,
                            const char *order_id,
-                           const struct TALER_ClaimTokenP *claim_token,
                            json_t *contract_terms);