aboutsummaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_purses_create.c1
-rw-r--r--src/exchange/taler-exchange-httpd_purses_deposit.c8
-rw-r--r--src/exchange/taler-exchange-httpd_reserves_purse.c1
3 files changed, 0 insertions, 10 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_create.c b/src/exchange/taler-exchange-httpd_purses_create.c
index f8293981..dba4fa4a 100644
--- a/src/exchange/taler-exchange-httpd_purses_create.c
+++ b/src/exchange/taler-exchange-httpd_purses_create.c
@@ -176,7 +176,6 @@ reply_create_success (struct MHD_Connection *connection,
&pcc->amount,
&pcc->deposit_total,
pcc->purse_pub,
- &pcc->merge_pub,
&pcc->h_contract_terms,
&pub,
&sig)))
diff --git a/src/exchange/taler-exchange-httpd_purses_deposit.c b/src/exchange/taler-exchange-httpd_purses_deposit.c
index 38bd8472..f1f6ecab 100644
--- a/src/exchange/taler-exchange-httpd_purses_deposit.c
+++ b/src/exchange/taler-exchange-httpd_purses_deposit.c
@@ -98,11 +98,6 @@ struct PurseDepositContext
struct GNUNET_TIME_Timestamp purse_expiration;
/**
- * Key with the merge capability (needed for signing).
- */
- struct TALER_PurseMergePublicKeyP merge_pub;
-
- /**
* Hash of the contract (needed for signing).
*/
struct TALER_PrivateContractHashP h_contract_terms;
@@ -152,7 +147,6 @@ reply_deposit_success (struct MHD_Connection *connection,
&pcc->amount,
&pcc->deposit_total,
pcc->purse_pub,
- &pcc->merge_pub,
&pcc->h_contract_terms,
&pub,
&sig)))
@@ -175,8 +169,6 @@ reply_deposit_success (struct MHD_Connection *connection,
pcc->purse_expiration),
GNUNET_JSON_pack_data_auto ("h_contract_terms",
&pcc->h_contract_terms),
- GNUNET_JSON_pack_data_auto ("merge_pub",
- &pcc->merge_pub),
GNUNET_JSON_pack_data_auto ("exchange_sig",
&sig),
GNUNET_JSON_pack_data_auto ("exchange_pub",
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c
index 77321b2c..b4035b55 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.c
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -165,7 +165,6 @@ reply_purse_success (struct MHD_Connection *connection,
&rpc->amount,
&rpc->deposit_total,
&rpc->purse_pub,
- &rpc->merge_pub,
&rpc->h_contract_terms,
&pub,
&sig)))