final fixes to make test pass
This commit is contained in:
parent
0372b7583b
commit
b8c264656c
@ -29,6 +29,9 @@ libtalermint_la_LIBADD = \
|
||||
check_PROGRAMS = \
|
||||
test_mint_api
|
||||
|
||||
TESTS = \
|
||||
$(check_PROGRAMS)
|
||||
|
||||
test_mint_api_SOURCES = \
|
||||
test_mint_api.c
|
||||
test_mint_api_LDADD = \
|
||||
|
@ -677,10 +677,6 @@ TALER_MINT_deposit (struct TALER_MINT_Handle *mint,
|
||||
curl_easy_setopt (eh,
|
||||
CURLOPT_URL,
|
||||
dh->url));
|
||||
GNUNET_assert (CURLE_OK ==
|
||||
curl_easy_setopt (eh,
|
||||
CURLOPT_VERBOSE,
|
||||
1LL));
|
||||
GNUNET_assert (CURLE_OK ==
|
||||
curl_easy_setopt (eh,
|
||||
CURLOPT_POSTFIELDS,
|
||||
|
@ -1045,7 +1045,7 @@ main (int argc,
|
||||
"-d", "test-mint-home",
|
||||
NULL);
|
||||
/* give child time to start and bind against the socket */
|
||||
sleep (5);
|
||||
sleep (2);
|
||||
result = GNUNET_SYSERR;
|
||||
GNUNET_SCHEDULER_run (&run, NULL);
|
||||
GNUNET_OS_process_kill (mintd,
|
||||
|
@ -386,10 +386,12 @@ reload_keys_sign_iter (void *cls,
|
||||
|
||||
/* The signkey is valid at this time, check if it's more recent than
|
||||
what we have so far! */
|
||||
if (GNUNET_TIME_absolute_ntoh (ctx->current_sign_key_issue.issue.start).abs_value_us <
|
||||
GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us)
|
||||
if ( (GNUNET_TIME_absolute_ntoh (ctx->current_sign_key_issue.issue.start).abs_value_us <
|
||||
GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us) &&
|
||||
(GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us <
|
||||
now.abs_value_us) )
|
||||
{
|
||||
/* We keep the most recent one around */
|
||||
/* We use the most recent one, if it is valid now (not just in the near future) */
|
||||
ctx->current_sign_key_issue = *ski;
|
||||
}
|
||||
json_array_append_new (ctx->sign_keys_array,
|
||||
|
@ -367,7 +367,7 @@ TMH_RESPONSE_reply_deposit_success (struct MHD_Connection *connection,
|
||||
&sig);
|
||||
return TMH_RESPONSE_reply_json_pack (connection,
|
||||
MHD_HTTP_OK,
|
||||
"{s:s, s:o}",
|
||||
"{s:s, s:o, s:o}",
|
||||
"status", "DEPOSIT_OK",
|
||||
"sig", TALER_json_from_data (&sig,
|
||||
sizeof (sig)),
|
||||
|
Loading…
Reference in New Issue
Block a user