From d88048e4b91bf79db44c6f97be03c44311c9568f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 9 Jul 2015 13:01:39 +0200 Subject: [PATCH] fix transaction ID conversion in DB --- src/mint-lib/mint_api_json.c | 3 ++- src/mintdb/plugin_mintdb_postgres.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mint-lib/mint_api_json.c b/src/mint-lib/mint_api_json.c index 25876e07a..8b0b54375 100644 --- a/src/mint-lib/mint_api_json.c +++ b/src/mint-lib/mint_api_json.c @@ -23,7 +23,6 @@ #include "platform.h" #include "mint_api_json.h" - /** * Navigate and parse data in a JSON tree. * @@ -239,6 +238,7 @@ parse_json (json_t *root, MAJ_parse_free (sig_spec); return i; } + if (GNUNET_OK != GNUNET_CRYPTO_eddsa_verify (ntohl (purpose->purpose), purpose, @@ -306,6 +306,7 @@ parse_free (struct MAJ_Specification *spec, case MAJ_CMD_EDDSA_SIGNATURE: GNUNET_free (*spec[i].details.eddsa_signature.purpose_p); *spec[i].details.eddsa_signature.purpose_p = NULL; + break; default: GNUNET_break (0); break; diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c index bef3f9301..d6e136da0 100644 --- a/src/mintdb/plugin_mintdb_postgres.c +++ b/src/mintdb/plugin_mintdb_postgres.c @@ -1752,7 +1752,7 @@ postgres_have_deposit (void *cls, { struct TALER_PQ_QueryParam params[] = { 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_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_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_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->deposit_fee), TALER_PQ_query_param_absolute_time (&deposit->timestamp),