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.c12
-rw-r--r--src/exchange/taler-exchange-httpd_reserves_purse.c13
2 files changed, 4 insertions, 21 deletions
diff --git a/src/exchange/taler-exchange-httpd_purses_create.c b/src/exchange/taler-exchange-httpd_purses_create.c
index 65cd5d45..434984d8 100644
--- a/src/exchange/taler-exchange-httpd_purses_create.c
+++ b/src/exchange/taler-exchange-httpd_purses_create.c
@@ -369,13 +369,9 @@ create_transaction (void *cls,
}
/* 3) if present, persist contract */
in_conflict = true;
- // FIXME: combine econtract arguments into one!
qs = TEH_plugin->insert_contract (TEH_plugin->cls,
pcc->purse_pub,
- &pcc->econtract.contract_pub,
- pcc->econtract.econtract_size,
- pcc->econtract.econtract,
- &pcc->econtract.econtract_sig,
+ &pcc->econtract,
&in_conflict);
if (qs < 0)
{
@@ -393,14 +389,10 @@ create_transaction (void *cls,
struct TALER_EncryptedContract econtract;
struct GNUNET_HashCode h_econtract;
- // FIXME: combine econtract arguments into one!
qs = TEH_plugin->select_contract_by_purse (
TEH_plugin->cls,
pcc->purse_pub,
- &econtract.contract_pub,
- &econtract.econtract_sig,
- &econtract.econtract_size,
- &econtract.econtract);
+ &econtract);
if (qs <= 0)
{
if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c b/src/exchange/taler-exchange-httpd_reserves_purse.c
index af86bc91..74291976 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.c
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -411,13 +411,9 @@ purse_transaction (void *cls,
{
bool in_conflict = true;
- // FIXME: combine econtract args!
qs = TEH_plugin->insert_contract (TEH_plugin->cls,
&rpc->purse_pub,
- &rpc->econtract.contract_pub,
- rpc->econtract.econtract_size,
- rpc->econtract.econtract,
- &rpc->econtract.econtract_sig,
+ &rpc->econtract,
&in_conflict);
if (qs < 0)
{
@@ -435,15 +431,10 @@ purse_transaction (void *cls,
struct TALER_EncryptedContract econtract;
struct GNUNET_HashCode h_econtract;
- /* FIXME: change API to only pass econtract
- instead of all members! */
qs = TEH_plugin->select_contract_by_purse (
TEH_plugin->cls,
&rpc->purse_pub,
- &econtract.contract_pub,
- &econtract.econtract_sig,
- &econtract.econtract_size,
- &econtract.econtract);
+ &econtract);
if (qs <= 0)
{
if (GNUNET_DB_STATUS_SOFT_ERROR == qs)