diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 17:56:12 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2015-11-05 17:56:12 +0100 |
| commit | c1159ff547afffd135cde78c026dd35817d2f927 (patch) | |
| tree | 9d0126a494b7018d4ad70e2c7d21de75ca6c3e8f /src/tests/test_contract.c | |
| parent | 45cd6f3e16d8411add89588673cd58873293c2b0 (diff) | |
| parent | e55860d9139702f39ce2b61df5bb0e33e1f30a08 (diff) | |
| download | merchant-c1159ff547afffd135cde78c026dd35817d2f927.tar.gz merchant-c1159ff547afffd135cde78c026dd35817d2f927.tar.bz2 merchant-c1159ff547afffd135cde78c026dd35817d2f927.zip | |
Merge branch 'fix4013'
Conflicts:
src/frontend/index.html
Diffstat (limited to 'src/tests/test_contract.c')
| -rw-r--r-- | src/tests/test_contract.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/tests/test_contract.c b/src/tests/test_contract.c index 47b3b0e6..147ea4f3 100644 --- a/src/tests/test_contract.c +++ b/src/tests/test_contract.c @@ -23,7 +23,7 @@ #include "platform.h" #include <jansson.h> #include <gnunet/gnunet_util_lib.h> -#include <taler/taler_json_lib.h> +#include <taler/taler_util.h> #include "merchant.h" #include "merchant_db.h" #include <taler_merchant_lib.h> @@ -80,7 +80,6 @@ run (void *cls, char *const *args, const char *cfgfile, { json_t *j_fake_contract; - json_t *j_wire; json_t *j_details; json_t *j_mints; json_t *j_item; @@ -98,22 +97,17 @@ run (void *cls, char *const *args, const char *cfgfile, json_t *j_merchant_zipcode; json_t *j_lnames; json_t *j_deldate; - char *contract_tmp_str; char *desc; struct TALER_Amount amount; int64_t t_id; int64_t p_id; - #ifdef OBSOLETE - struct ContractNBO contract; - #else struct Contract contract; - #endif struct GNUNET_TIME_Absolute edate; struct GNUNET_TIME_Absolute now; uint64_t nounce; struct GNUNET_HashCode h_contract_str; char *aa; - char *fancy_time; + const char *fancy_time; uint32_t ret; db_conn = NULL; @@ -278,8 +272,6 @@ run (void *cls, char *const *args, const char *cfgfile, nounce = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_NONCE, UINT64_MAX); - j_wire = MERCHANT_get_wire_json (wire, nounce, now); - ret = MERCHANT_handle_contract (j_fake_contract, db_conn, &contract, |