fix transaction ID conversion in DB

This commit is contained in:
Christian Grothoff 2015-07-09 13:01:39 +02:00
parent a24171d0fa
commit d88048e4b9
2 changed files with 4 additions and 3 deletions

View File

@ -23,7 +23,6 @@
#include "platform.h" #include "platform.h"
#include "mint_api_json.h" #include "mint_api_json.h"
/** /**
* Navigate and parse data in a JSON tree. * Navigate and parse data in a JSON tree.
* *
@ -239,6 +238,7 @@ parse_json (json_t *root,
MAJ_parse_free (sig_spec); MAJ_parse_free (sig_spec);
return i; return i;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CRYPTO_eddsa_verify (ntohl (purpose->purpose), GNUNET_CRYPTO_eddsa_verify (ntohl (purpose->purpose),
purpose, purpose,
@ -306,6 +306,7 @@ parse_free (struct MAJ_Specification *spec,
case MAJ_CMD_EDDSA_SIGNATURE: case MAJ_CMD_EDDSA_SIGNATURE:
GNUNET_free (*spec[i].details.eddsa_signature.purpose_p); GNUNET_free (*spec[i].details.eddsa_signature.purpose_p);
*spec[i].details.eddsa_signature.purpose_p = NULL; *spec[i].details.eddsa_signature.purpose_p = NULL;
break;
default: default:
GNUNET_break (0); GNUNET_break (0);
break; break;

View File

@ -1752,7 +1752,7 @@ postgres_have_deposit (void *cls,
{ {
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),
TALER_PQ_query_param_auto_from_type (&deposit->transaction_id), TALER_PQ_query_param_uint64 (&deposit->transaction_id),
TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub), TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub),
TALER_PQ_query_param_end TALER_PQ_query_param_end
}; };
@ -1846,7 +1846,7 @@ postgres_insert_deposit (void *cls,
TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub), TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
TALER_PQ_query_param_rsa_public_key (deposit->coin.denom_pub.rsa_public_key), TALER_PQ_query_param_rsa_public_key (deposit->coin.denom_pub.rsa_public_key),
TALER_PQ_query_param_rsa_signature (deposit->coin.denom_sig.rsa_signature), TALER_PQ_query_param_rsa_signature (deposit->coin.denom_sig.rsa_signature),
TALER_PQ_query_param_auto_from_type (&deposit->transaction_id), TALER_PQ_query_param_uint64 (&deposit->transaction_id),
TALER_PQ_query_param_amount (&deposit->amount_with_fee), TALER_PQ_query_param_amount (&deposit->amount_with_fee),
TALER_PQ_query_param_amount (&deposit->deposit_fee), TALER_PQ_query_param_amount (&deposit->deposit_fee),
TALER_PQ_query_param_absolute_time (&deposit->timestamp), TALER_PQ_query_param_absolute_time (&deposit->timestamp),