taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixing #3833

Browse Source
This commit is contained in:
Christian Grothoff 2015-06-11 12:10:54 +02:00
parent c502b82da4
commit ed2b1c1b6f
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mintdb/plugin_mintdb_postgres.c
View File

@ -1627,11 +1627,9 @@ postgres_insert_deposit (void *cls,
struct TALER_MINTDB_Session *session, struct TALER_MINTDB_Session *session,
const struct TALER_MINTDB_Deposit *deposit) const struct TALER_MINTDB_Deposit *deposit)
{ {
char *json_wire_enc;
PGresult *result; PGresult *result;
int ret; int ret;
json_wire_enc = json_dumps (deposit->wire, JSON_COMPACT);
{ {
struct TALER_PQ_QueryParam params[] = { struct TALER_PQ_QueryParam params[] = {
TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub), TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
@ -1643,9 +1641,8 @@ postgres_insert_deposit (void *cls,
TALER_PQ_query_param_auto_from_type (&deposit->h_contract), TALER_PQ_query_param_auto_from_type (&deposit->h_contract),
TALER_PQ_query_param_auto_from_type (&deposit->h_wire), TALER_PQ_query_param_auto_from_type (&deposit->h_wire),
TALER_PQ_query_param_auto_from_type (&deposit->csig), TALER_PQ_query_param_auto_from_type (&deposit->csig),
TALER_PQ_query_param_fixed_size (json_wire_enc, TALER_PQ_query_param_json (deposit->wire),
strlen (json_wire_enc)), /* FIXME: refund_deadline, timestamp, deposit_fee
/* FIXME: refund_deadline, timestamp, deposit_fee and 'wire' details
not stored! #3826 */ not stored! #3826 */
TALER_PQ_query_param_end TALER_PQ_query_param_end
}; };
@ -1663,7 +1660,6 @@ postgres_insert_deposit (void *cls,
ret = GNUNET_OK; ret = GNUNET_OK;
} }
PQclear (result); PQclear (result);
GNUNET_free_non_null (json_wire_enc);
return ret; return ret;
} }
@ -2684,9 +2680,6 @@ postgres_get_coin_transactions (void *cls,
for (i = 0; i < nrows; i++) for (i = 0; i < nrows; i++)
{ {
struct TALER_MINTDB_Deposit *deposit; struct TALER_MINTDB_Deposit *deposit;
json_error_t json_error;
void *json_wire_enc;
size_t json_wire_enc_size;
deposit = GNUNET_new (struct TALER_MINTDB_Deposit); deposit = GNUNET_new (struct TALER_MINTDB_Deposit);
{ {
@ -2704,9 +2697,8 @@ postgres_get_coin_transactions (void *cls,
&deposit->h_contract), &deposit->h_contract),
TALER_PQ_result_spec_auto_from_type ("h_wire", TALER_PQ_result_spec_auto_from_type ("h_wire",
&deposit->h_wire), &deposit->h_wire),
TALER_PQ_result_spec_variable_size ("wire", TALER_PQ_result_spec_json ("wire",
&json_wire_enc, &deposit->wire),
&json_wire_enc_size), /* FIXME: #3833 */
/** FIXME: , #3820 /** FIXME: , #3820
* TALER_PQ_result_spec_auto_from_type ("timestamp", &deposit->timestamp), * TALER_PQ_result_spec_auto_from_type ("timestamp", &deposit->timestamp),
* TALER_PQ_result_spec_auto_from_type ("refund_deadline", &deposit->refund_deadline), * TALER_PQ_result_spec_auto_from_type ("refund_deadline", &deposit->refund_deadline),
@ -2726,17 +2718,6 @@ postgres_get_coin_transactions (void *cls,
goto cleanup; goto cleanup;
} }
} }
deposit->wire = json_loads (json_wire_enc,
JSON_REJECT_DUPLICATES,
&json_error); /* FIXME: #3833 */
if (NULL == deposit->wire)
{
TALER_json_warn (json_error);
GNUNET_free (json_wire_enc);
GNUNET_free (deposit);
goto cleanup;
}
GNUNET_free (json_wire_enc);
tl = GNUNET_new (struct TALER_MINTDB_TransactionList); tl = GNUNET_new (struct TALER_MINTDB_TransactionList);
tl->next = head; tl->next = head;
tl->type = TALER_MINTDB_TT_DEPOSIT; tl->type = TALER_MINTDB_TT_DEPOSIT;