summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <marcello.stanisci@inria.fr>2017-07-05 14:10:50 +0200
committerMarcello Stanisci <marcello.stanisci@inria.fr>2017-07-05 14:11:26 +0200
commit5e2e4432704549a7326fbce5ac59c082d777f186 (patch)
treea63bf50b0177164ea5ad8dc3c2947403da20f3f8
parent15ff300f61aaea3505f206eef0a4a2c3cfe033e6 (diff)
downloadmerchant-5e2e4432704549a7326fbce5ac59c082d777f186.tar.gz
merchant-5e2e4432704549a7326fbce5ac59c082d777f186.tar.bz2
merchant-5e2e4432704549a7326fbce5ac59c082d777f186.zip
moving a 'PS' struct into exchange codebase
-rw-r--r--src/backend/taler-merchant-httpd_refund.c4
-rw-r--r--src/backend/taler-merchant-httpd_refund.h20
2 files changed, 2 insertions, 22 deletions
diff --git a/src/backend/taler-merchant-httpd_refund.c b/src/backend/taler-merchant-httpd_refund.c
index ba79bf9a..509235e5 100644
--- a/src/backend/taler-merchant-httpd_refund.c
+++ b/src/backend/taler-merchant-httpd_refund.c
@@ -119,7 +119,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
const char *merchant;
struct MerchantInstance *mi;
struct GNUNET_HashCode h_contract_terms;
- struct RefundConfirmationP confirmation;
+ struct TALER_MerchantRefundConfirmationPS confirmation;
struct GNUNET_CRYPTO_EddsaSignature sig;
struct GNUNET_JSON_Specification spec[] = {
TALER_JSON_spec_amount ("refund", &refund),
@@ -264,7 +264,7 @@ MH_handler_refund_increase (struct TMH_RequestHandler *rh,
GNUNET_JSON_parse_free (spec);
confirmation.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_REFUND_OK);
- confirmation.purpose.size = htonl (sizeof (struct RefundConfirmationP));
+ confirmation.purpose.size = htonl (sizeof (struct TALER_MerchantRefundConfirmationPS));
if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_sign (&mi->privkey.eddsa_priv,
diff --git a/src/backend/taler-merchant-httpd_refund.h b/src/backend/taler-merchant-httpd_refund.h
index c19d69e7..64da3f9b 100644
--- a/src/backend/taler-merchant-httpd_refund.h
+++ b/src/backend/taler-merchant-httpd_refund.h
@@ -26,26 +26,6 @@
#include "taler-merchant-httpd.h"
/**
- * We confirm with a signature that the refund has been successfully
- * done. Even though the frontend doesn't usually do crypto, this signature
- * may turn useful in court.
- */
-struct RefundConfirmationP
-{
-
- /**
- * Set to TALER_SIGNATURE_MERCHANT_REFUND_OK.
- */
- struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
- /**
- * Hashing the order id, as frontends don't handle contract terms
- */
- struct GNUNET_HashCode h_order_id GNUNET_PACKED;
-
-};
-
-/**
* Handle request for increasing the refund associated with
* a contract.
*