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

do not hang in taler-auditor-offline if sign output is empty

Browse Source
This commit is contained in:
Christian Grothoff 2021-04-12 20:29:02 +02:00
parent e82329749c
commit 245e757438
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/exchange-tools/taler-auditor-offline.c
View File

@ -289,8 +289,7 @@ output_operation (const char *op_name,
{ {
json_t *action; json_t *action;
if (NULL == out) GNUNET_assert (NULL != out);
out = json_array ();
action = json_pack ("{ s:s, s:o }", action = json_pack ("{ s:s, s:o }",
"operation", "operation",
op_name, op_name,
@ -526,6 +525,8 @@ trigger_upload (const char *exchange_url)
return; return;
} }
} }
/* test here, in case no upload was triggered (i.e. empty input) */
test_shutdown ();
} }
@ -1161,8 +1162,6 @@ do_sign (char *const *args)
json_decref (keys); json_decref (keys);
return; return;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_JSON_parse (keys, GNUNET_JSON_parse (keys,
spec, spec,
@ -1189,6 +1188,8 @@ do_sign (char *const *args)
json_decref (keys); json_decref (keys);
return; return;
} }
if (NULL == out)
out = json_array ();
if (GNUNET_OK != if (GNUNET_OK !=
sign_denomkeys (denomkeys)) sign_denomkeys (denomkeys))
{ {
@ -1220,6 +1221,8 @@ do_setup (char *const *args)
} }
if (NULL != *args) if (NULL != *args)
{ {
if (NULL == out)
out = json_array ();
output_operation (OP_SETUP, output_operation (OP_SETUP,
json_pack ("{s:o}", json_pack ("{s:o}",
"auditor_pub", "auditor_pub",

1
src/exchange-tools/taler-exchange-offline.c
View File

@ -1953,7 +1953,6 @@ do_add_auditor (char *const *args)
return; return;
now = GNUNET_TIME_absolute_get (); now = GNUNET_TIME_absolute_get ();
(void) GNUNET_TIME_round_abs (&now); (void) GNUNET_TIME_round_abs (&now);
TALER_exchange_offline_auditor_add_sign (&auditor_pub, TALER_exchange_offline_auditor_add_sign (&auditor_pub,
args[1], args[1],
now, now,