[GNUnet-SVN] [taler-merchant] branch master updated: Fix compilation: #4869

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 0cb3424  Fix compilation: #4869
0cb3424 is described below

commit 0cb34246645f9a9c9609644bfa110a00fe07c376
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jan 27 17:15:03 2017 +0100

    Fix compilation: #4869
---
 src/backend/taler-merchant-httpd_contract.c | 6 ------
 src/backend/taler-merchant-httpd_pay.c      | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_contract.c 
b/src/backend/taler-merchant-httpd_contract.c
index e9ebda4..91e95d6 100644
--- a/src/backend/taler-merchant-httpd_contract.c
+++ b/src/backend/taler-merchant-httpd_contract.c
@@ -259,15 +259,9 @@ MH_handler_contract (struct TMH_RequestHandler *rh,
   /* create contract signature */
   contract.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_CONTRACT);
   contract.purpose.size = htonl (sizeof (contract));
-  contract.transaction_id = GNUNET_htonll (transaction_id);
-  TALER_amount_hton (&contract.total_amount,
-                     &total);
-  TALER_amount_hton (&contract.max_fee,
-                     &max_fee);
   GNUNET_assert (GNUNET_OK ==
                  TALER_JSON_hash (jcontract,
                                   &contract.h_contract));
-  contract.merchant_pub = mi->pubkey;
   GNUNET_CRYPTO_eddsa_sign (&mi->privkey.eddsa_priv,
                             &contract.purpose,
                             &contract_sig);
diff --git a/src/backend/taler-merchant-httpd_pay.c 
b/src/backend/taler-merchant-httpd_pay.c
index a920db0..f981074 100644
--- a/src/backend/taler-merchant-httpd_pay.c
+++ b/src/backend/taler-merchant-httpd_pay.c
@@ -990,13 +990,7 @@ MH_handler_pay (struct TMH_RequestHandler *rh,
                "Parsed JSON for /pay.\n");
     cp.purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_CONTRACT);
     cp.purpose.size = htonl (sizeof (struct TALER_ContractPS));
-    cp.transaction_id = GNUNET_htonll (pc->transaction_id);
-    TALER_amount_hton (&cp.total_amount,
-                      &pc->amount);
-    TALER_amount_hton (&cp.max_fee,
-                      &pc->max_fee);
     cp.h_contract = pc->h_contract;
-    cp.merchant_pub = pc->mi->pubkey;
     if (GNUNET_OK !=
        GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_CONTRACT,
                                    &cp.purpose,

-- 
To stop receiving notification emails like this one, please contact
address@hidden