diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-05-31 17:31:59 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-05-31 17:31:59 +0200 |
| commit | 552e5882589fe22838bd2519a2491d4b4d2cdce3 (patch) | |
| tree | 71f4ef2c8ab8ba32e1100b41232ee0bf690aa6b6 /src/tests/test_contract.c | |
| parent | 29976e055994339b651c9a26e3a1adb873625f22 (diff) | |
| parent | e76a7e19337ff34e0fc22513efc01490be52e7e8 (diff) | |
| download | merchant-552e5882589fe22838bd2519a2491d4b4d2cdce3.tar.gz merchant-552e5882589fe22838bd2519a2491d4b4d2cdce3.tar.bz2 merchant-552e5882589fe22838bd2519a2491d4b4d2cdce3.zip | |
Merge branch 'master' of git+ssh://taler.net/var/git/merchant
Diffstat (limited to 'src/tests/test_contract.c')
| -rw-r--r-- | src/tests/test_contract.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/tests/test_contract.c b/src/tests/test_contract.c index 2e032334..bc62c0af 100644 --- a/src/tests/test_contract.c +++ b/src/tests/test_contract.c @@ -65,7 +65,7 @@ extern uint32_t TALER_MERCHANTDB_contract_get_values (PGconn *conn, const struct GNUNET_HashCode *h_contract, uint64_t *nounce, - struct GNUNET_TIME_Absolute *edate); + struct GNUNET_TIME_Absolute *wire_transfer_deadline); /** @@ -104,7 +104,7 @@ run (void *cls, char *const *args, const char *cfgfile, int64_t t_id; int64_t p_id; struct Contract contract; - struct GNUNET_TIME_Absolute edate; + struct GNUNET_TIME_Absolute wire_transfer_deadline; struct GNUNET_TIME_Absolute now; uint64_t nounce; struct GNUNET_HashCode h_contract_str; @@ -294,17 +294,21 @@ 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 == TALER_MERCHANTDB_contract_get_values (db_conn, &h_contract_str, &nounce, &edate)) + if (GNUNET_SYSERR == + TALER_MERCHANTDB_contract_get_values (db_conn, + &h_contract_str, + &nounce, + &wire_transfer_deadline)) + { printf ("no hash found\n"); + } else { - fancy_time = GNUNET_STRINGS_absolute_time_to_string (edate); + fancy_time = GNUNET_STRINGS_absolute_time_to_string (wire_transfer_deadline); printf ("hash found!, nounce is : %llu\n", nounce); - printf ("hash found!, time is : %s\n", fancy_time); + printf ("hash found!, wire transfer time is : %s\n", fancy_time); } - - return; } |