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

add test for varsize pq operation

Browse Source
This commit is contained in:
Christian Grothoff 2015-05-17 16:46:16 +02:00
parent 9eac126e52
commit 25e530f37a
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/taler_pq_lib.h
View File

@ -310,8 +310,8 @@ struct TALER_PQ_ResultSpec
*/ */
struct TALER_PQ_ResultSpec struct TALER_PQ_ResultSpec
TALER_PQ_result_spec_variable_size (const char *name, TALER_PQ_result_spec_variable_size (const char *name,
void **dst, void **dst,
size_t *sptr); size_t *sptr);
/** /**

14
src/pq/test_pq.c
View File

@ -60,9 +60,10 @@ postgres_prepare (PGconn *db_conn)
",namount_val" ",namount_val"
",namount_frac" ",namount_frac"
",namount_curr" ",namount_curr"
",vsize"
") VALUES " ") VALUES "
"($1, $2, $3, $4, $5, $6," "($1, $2, $3, $4, $5, $6,"
"$7, $8, $9, $10, $11);", "$7, $8, $9, $10, $11, $12);",
11, NULL); 11, NULL);
PREPARE ("test_select", PREPARE ("test_select",
"SELECT" "SELECT"
@ -77,6 +78,7 @@ postgres_prepare (PGconn *db_conn)
",namount_val" ",namount_val"
",namount_frac" ",namount_frac"
",namount_curr" ",namount_curr"
",vsize"
" FROM test_pq" " FROM test_pq"
" ORDER BY abs_time DESC " " ORDER BY abs_time DESC "
" LIMIT 1;", " LIMIT 1;",
@ -112,6 +114,8 @@ run_queries (PGconn *conn)
int ret; int ret;
struct GNUNET_CRYPTO_rsa_PrivateKey *priv; struct GNUNET_CRYPTO_rsa_PrivateKey *priv;
char msg[] = "Hello"; char msg[] = "Hello";
void *msg2;
size_t msg2_len;
priv = GNUNET_CRYPTO_rsa_private_key_create (1024); priv = GNUNET_CRYPTO_rsa_private_key_create (1024);
pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv); pub = GNUNET_CRYPTO_rsa_private_key_get_public (priv);
@ -134,6 +138,7 @@ run_queries (PGconn *conn)
TALER_PQ_query_param_auto_from_type (&hc), TALER_PQ_query_param_auto_from_type (&hc),
TALER_PQ_query_param_amount (&hamount), TALER_PQ_query_param_amount (&hamount),
TALER_PQ_query_param_amount_nbo (&namount), TALER_PQ_query_param_amount_nbo (&namount),
TALER_PQ_query_param_fixed_size (msg, strlen (msg)),
TALER_PQ_query_param_end TALER_PQ_query_param_end
}; };
struct TALER_PQ_QueryParam params_select[] = { struct TALER_PQ_QueryParam params_select[] = {
@ -147,6 +152,7 @@ run_queries (PGconn *conn)
TALER_PQ_result_spec_auto_from_type ("hash", &hc2), TALER_PQ_result_spec_auto_from_type ("hash", &hc2),
TALER_PQ_result_spec_amount ("hamount", &hamount2), TALER_PQ_result_spec_amount ("hamount", &hamount2),
TALER_PQ_result_spec_amount_nbo ("namount", &namount2), TALER_PQ_result_spec_amount_nbo ("namount", &namount2),
TALER_PQ_result_spec_variable_size ("vsize", &msg2, &msg2_len),
TALER_PQ_result_spec_end TALER_PQ_result_spec_end
}; };
@ -205,6 +211,11 @@ run_queries (PGconn *conn)
GNUNET_break (0 == GNUNET_break (0 ==
GNUNET_CRYPTO_rsa_public_key_cmp (pub, GNUNET_CRYPTO_rsa_public_key_cmp (pub,
pub2)); pub2));
GNUNET_break (strlen (msg) == msg2_len);
GNUNET_break (0 ==
strncmp (msg,
msg2,
msg2_len));
TALER_PQ_cleanup_result (results_select); TALER_PQ_cleanup_result (results_select);
PQclear (result); PQclear (result);
@ -254,6 +265,7 @@ main(int argc,
",namount_val INT8 NOT NULL" ",namount_val INT8 NOT NULL"
",namount_frac INT4 NOT NULL" ",namount_frac INT4 NOT NULL"
",namount_curr VARCHAR("TALER_CURRENCY_LEN_STR") NOT NULL" ",namount_curr VARCHAR("TALER_CURRENCY_LEN_STR") NOT NULL"
",vsize VARCHAR NOT NULL"
")"); ")");
if (PGRES_COMMAND_OK != PQresultStatus (result)) if (PGRES_COMMAND_OK != PQresultStatus (result))
{ {

2
src/util/crypto.c
View File

@ -49,7 +49,7 @@ fatal_error_handler (void *cls,
/** /**
* Initialize libgcrypt. * Initialize libgcrypt.
*/ */
void void __attribute__ ((constructor))
TALER_gcrypt_init () TALER_gcrypt_init ()
{ {
gcry_set_fatalerror_handler (&fatal_error_handler, gcry_set_fatalerror_handler (&fatal_error_handler,