diff options
8 files changed, 20 insertions, 20 deletions
diff --git a/src/backend/taler-merchant-httpd_get-orders-ID.c b/src/backend/taler-merchant-httpd_get-orders-ID.c index 826c5301..e6bad56f 100644 --- a/src/backend/taler-merchant-httpd_get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_get-orders-ID.c @@ -784,8 +784,8 @@ TMH_get_orders_ID (const struct TMH_RequestHandler *rh, struct GNUNET_HashCode h; if (GNUNET_OK != - TALER_JSON_hash (god->contract_terms, - &h)) + TALER_JSON_contract_hash (god->contract_terms, + &h)) { GNUNET_break (0); GNUNET_free (god); diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-claim.c b/src/backend/taler-merchant-httpd_post-orders-ID-claim.c index c6dc7e6b..b1c15222 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-claim.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-claim.c @@ -224,8 +224,8 @@ TMH_post_orders_ID_claim (const struct TMH_RequestHandler *rh, }; if (GNUNET_OK != - TALER_JSON_hash (contract_terms, - &pdps.hash)) + TALER_JSON_contract_hash (contract_terms, + &pdps.hash)) { GNUNET_break (0); return TALER_MHD_reply_with_error (connection, diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c index d22c5a75..ca041863 100644 --- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c +++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c @@ -1642,8 +1642,8 @@ parse_pay (struct MHD_Connection *connection, /* hash contract (needed later) */ if (GNUNET_OK != - TALER_JSON_hash (contract_terms, - &pc->h_contract_terms)) + TALER_JSON_contract_hash (contract_terms, + &pc->h_contract_terms)) { GNUNET_break (0); json_decref (contract_terms); diff --git a/src/backend/taler-merchant-httpd_private-get-orders-ID.c b/src/backend/taler-merchant-httpd_private-get-orders-ID.c index b6bdb139..87408fe5 100644 --- a/src/backend/taler-merchant-httpd_private-get-orders-ID.c +++ b/src/backend/taler-merchant-httpd_private-get-orders-ID.c @@ -880,8 +880,8 @@ TMH_private_get_orders_ID (const struct TMH_RequestHandler *rh, } } if (GNUNET_OK != - TALER_JSON_hash (gorc->contract_terms, - &gorc->h_contract_terms)) + TALER_JSON_contract_hash (gorc->contract_terms, + &gorc->h_contract_terms)) { GNUNET_break (0); return TALER_MHD_reply_with_error (connection, diff --git a/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c b/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c index bd90bf64..f783d3a5 100644 --- a/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c +++ b/src/backend/taler-merchant-httpd_private-post-orders-ID-track-UNSPEC.c @@ -1167,8 +1167,8 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh, "Given order_id doesn't map to any proposal"); if (GNUNET_OK != - TALER_JSON_hash (contract_terms, - &tctx->h_contract_terms)) + TALER_JSON_contract_hash (contract_terms, + &tctx->h_contract_terms)) { json_decref (contract_terms); return TALER_MHD_reply_with_error (connection, diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index aab9a55c..b0c82e4f 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -1497,8 +1497,8 @@ postgres_insert_contract_terms (void *cls, struct GNUNET_HashCode h_contract_terms; if (GNUNET_OK != - TALER_JSON_hash (contract_terms, - &h_contract_terms)) + TALER_JSON_contract_hash (contract_terms, + &h_contract_terms)) { GNUNET_break (0); return GNUNET_SYSERR; diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c index 152cb567..0d415555 100644 --- a/src/backenddb/test_merchantdb.c +++ b/src/backenddb/test_merchantdb.c @@ -1708,8 +1708,8 @@ test_mark_contract_paid (const struct InstanceData *instance, { struct GNUNET_HashCode h_contract_terms; GNUNET_assert (GNUNET_OK == - TALER_JSON_hash (order->contract, - &h_contract_terms)); + TALER_JSON_contract_hash (order->contract, + &h_contract_terms)); TEST_COND_RET_ON_FAIL (expected_result == plugin->mark_contract_paid (plugin->cls, instance->instance.id, @@ -1748,8 +1748,8 @@ test_lookup_order_status (const struct InstanceData *instance, return 1; } GNUNET_assert (GNUNET_OK == - TALER_JSON_hash (order->contract, - &h_contract_terms_expected)); + TALER_JSON_contract_hash (order->contract, + &h_contract_terms_expected)); if ((expected_paid != order_paid) || (0 != GNUNET_memcmp (&h_contract_terms, &h_contract_terms_expected))) @@ -2342,8 +2342,8 @@ make_deposit (const struct InstanceData *instance, deposit->timestamp = GNUNET_TIME_absolute_get (); GNUNET_assert (GNUNET_OK == - TALER_JSON_hash (order->contract, - &deposit->h_contract_terms)); + TALER_JSON_contract_hash (order->contract, + &deposit->h_contract_terms)); GNUNET_CRYPTO_eddsa_key_create (&coin_priv.eddsa_priv); GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv, &deposit->coin_pub.eddsa_pub); diff --git a/src/lib/merchant_api_post_order_claim.c b/src/lib/merchant_api_post_order_claim.c index 31be1235..08e4f771 100644 --- a/src/lib/merchant_api_post_order_claim.c +++ b/src/lib/merchant_api_post_order_claim.c @@ -139,8 +139,8 @@ handle_post_order_claim_finished (void *cls, } if (GNUNET_OK != - TALER_JSON_hash (contract_terms, - &hash)) + TALER_JSON_contract_hash (contract_terms, + &hash)) { GNUNET_break (0); hr.ec = TALER_EC_CLIENT_INTERNAL_FAILURE; |