diff options
author | Florian Dold <florian.dold@gmail.com> | 2015-12-18 10:57:48 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2015-12-18 10:57:48 +0100 |
commit | bc084ef901a528cf95bef4b8421eb53e4040af5f (patch) | |
tree | ff58d534e3299bdd1fe3c92b7698d2b00d8c74e1 /src/tests/test_contract.c | |
parent | 9ec51e8031d54616faea2c769791fdbbcfd8b3eb (diff) | |
parent | 4b528005ca4aacc366ce0e72bdc17a78b213d2ac (diff) | |
download | merchant-bc084ef901a528cf95bef4b8421eb53e4040af5f.tar.gz merchant-bc084ef901a528cf95bef4b8421eb53e4040af5f.tar.bz2 merchant-bc084ef901a528cf95bef4b8421eb53e4040af5f.zip |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Diffstat (limited to 'src/tests/test_contract.c')
-rw-r--r-- | src/tests/test_contract.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tests/test_contract.c b/src/tests/test_contract.c index 147ea4f3..68572a38 100644 --- a/src/tests/test_contract.c +++ b/src/tests/test_contract.c @@ -54,13 +54,13 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (NULL != db_conn) { - MERCHANT_DB_disconnect (db_conn); + TALER_MERCHANTDB_disconnect (db_conn); db_conn = NULL; } } extern uint32_t -MERCHANT_DB_get_contract_values (PGconn *conn, +TALER_MERCHANTDB_contract_get_values (PGconn *conn, const struct GNUNET_HashCode *h_contract, uint64_t *nounce, struct GNUNET_TIME_Absolute *edate); @@ -116,8 +116,8 @@ run (void *cls, char *const *args, const char *cfgfile, wire = NULL; - db_conn = MERCHANT_DB_connect (config); - if (GNUNET_OK != MERCHANT_DB_initialize (db_conn, GNUNET_NO)) + db_conn = TALER_MERCHANTDB_connect (config); + if (GNUNET_OK != TALER_MERCHANTDB_initialize (db_conn, GNUNET_NO)) { printf ("no db init'd\n"); result = GNUNET_SYSERR; @@ -293,7 +293,7 @@ run (void *cls, char *const *args, const char *cfgfile, printf ("contract string : %s\n", aa); GNUNET_CRYPTO_hash (aa, strlen (aa) + 1, &h_contract_str); - if (GNUNET_SYSERR == MERCHANT_DB_get_contract_values (db_conn, &h_contract_str, &nounce, &edate)) + if (GNUNET_SYSERR == TALER_MERCHANTDB_contract_get_values (db_conn, &h_contract_str, &nounce, &edate)) printf ("no hash found\n"); else { |