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

minor changes to get #3464 to work, finally

Browse Source
This commit is contained in:
Christian Grothoff 2017-05-29 18:27:15 +02:00
parent 85350ced32
commit 173c848fe9
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -882,12 +882,12 @@ TEH_KS_acquire_ (const char *location)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"No valid signing key found!\n"); "No valid signing key found!\n");
keys = json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}", keys = json_pack ("{s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
"master_public_key", "master_public_key",
GNUNET_JSON_from_data_auto (&TEH_master_public_key), GNUNET_JSON_from_data_auto (&TEH_master_public_key),
"signkeys", key_state->sign_keys_array, "signkeys", key_state->sign_keys_array,
"denoms", key_state->denom_keys_array, "denoms", key_state->denom_keys_array,
"payback", key_state->payback_array, // "payback", key_state->payback_array,
"auditors", key_state->auditors_array, "auditors", key_state->auditors_array,
"list_issue_date", GNUNET_JSON_from_time_abs (key_state->reload_time), "list_issue_date", GNUNET_JSON_from_time_abs (key_state->reload_time),
"eddsa_pub", GNUNET_JSON_from_data_auto (&key_state->current_sign_key_issue.issue.signkey_pub), "eddsa_pub", GNUNET_JSON_from_data_auto (&key_state->current_sign_key_issue.issue.signkey_pub),

13
src/exchange/taler-exchange-wirewatch.c
View File

@ -142,6 +142,12 @@ shutdown_task (void *cls)
static int static int
exchange_serve_process_config () exchange_serve_process_config ()
{ {
if (NULL == type)
{
fprintf (stderr,
"Option `-t' to specify wire plugin is mandatory.\n");
return GNUNET_SYSERR;
}
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg, GNUNET_CONFIGURATION_get_value_string (cfg,
"taler", "taler",
@ -169,7 +175,6 @@ exchange_serve_process_config ()
"Failed to initialize DB subsystem\n"); "Failed to initialize DB subsystem\n");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (NULL == if (NULL ==
(wire_plugin = TALER_WIRE_plugin_load (cfg, (wire_plugin = TALER_WIRE_plugin_load (cfg,
type))) type)))
@ -219,6 +224,8 @@ history_cb (void *cls,
{ {
hh = NULL; hh = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"End of list. Committing progress!\n");
ret = db_plugin->commit (db_plugin->cls, ret = db_plugin->commit (db_plugin->cls,
session); session);
if (GNUNET_OK == ret) if (GNUNET_OK == ret)
@ -236,6 +243,10 @@ history_cb (void *cls,
NULL); NULL);
return GNUNET_OK; /* will be ignored anyway */ return GNUNET_OK; /* will be ignored anyway */
} }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Adding wire transfer over %s with subject `%s'\n",
TALER_amount2s (&details->amount),
TALER_B2S (&details->reserve_pub));
ret = db_plugin->reserves_in_insert (db_plugin->cls, ret = db_plugin->reserves_in_insert (db_plugin->cls,
session, session,
&details->reserve_pub, &details->reserve_pub,