simplify datastructures

1 files changed, 13 insertions, 18 deletions

diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c
index 6393ff97..92bf5bdd 100644
--- a/src/exchange/taler-exchange-httpd_batch-deposit.c
+++ b/src/exchange/taler-exchange-httpd_batch-deposit.c
@@ -509,19 +509,19 @@ parse_coin (struct MHD_Connection *connection,
 
   TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
   if (GNUNET_OK !=
-      TALER_wallet_deposit_verify (&deposit->amount_with_fee,
-                                   &deposit->deposit_fee,
-                                   &dc->h_wire,
-                                   &dc->h_contract_terms,
-                                   &deposit->coin.h_age_commitment,
-                                   dc->has_policy ? &dc->h_policy :
-                                   NULL,
-                                   &deposit->coin.denom_pub_hash,
-                                   dc->timestamp,
-                                   &dc->merchant_pub,
-                                   dc->refund_deadline,
-                                   &deposit->coin.coin_pub,
-                                   &deposit->csig))
+      TALER_wallet_deposit_verify (
+        &deposit->amount_with_fee,
+        &deposit->deposit_fee,
+        &dc->h_wire,
+        &dc->h_contract_terms,
+        &deposit->coin.h_age_commitment,
+        dc->has_policy ? &dc->h_policy : NULL,
+        &deposit->coin.denom_pub_hash,
+        dc->timestamp,
+        &dc->merchant_pub,
+        dc->refund_deadline,
+        &deposit->coin.coin_pub,
+        &deposit->csig))
   {
     TALER_LOG_WARNING ("Invalid signature on /batch-deposit request\n");
     GNUNET_JSON_parse_free (spec);
@@ -537,11 +537,6 @@ parse_coin (struct MHD_Connection *connection,
   deposit->h_contract_terms = dc->h_contract_terms;
   deposit->wire_salt = dc->wire_salt;
   deposit->receiver_wire_account = (char *) dc->payto_uri;
-  /* FIXME-OEC: #7270 should NOT insert the extension details N times,
-     but rather insert them ONCE and then per-coin only use
-     the resulting extension UUID/serial; so the data structure
-     here should be changed once we look at extensions in earnest.  */
-  deposit->policy_json = dc->policy_json;
   deposit->timestamp = dc->timestamp;
   deposit->refund_deadline = dc->refund_deadline;
   deposit->wire_deadline = dc->wire_deadline;