diff options
| -rw-r--r-- | src/bank-lib/testing_api_cmd_history.c | 4 | ||||
| -rw-r--r-- | src/bank-lib/testing_api_cmd_reject.c | 4 | ||||
| -rw-r--r-- | src/exchange-lib/exchange_api_handle.c | 3 | ||||
| -rw-r--r-- | src/exchange-lib/testing_api_cmd_bank_check.c | 8 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_keystate.c | 1 | ||||
| -rw-r--r-- | src/exchangedb/plugin_exchangedb_postgres.c | 1 |
6 files changed, 13 insertions, 8 deletions
diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c index c9f4960e7..361315ee9 100644 --- a/src/bank-lib/testing_api_cmd_history.c +++ b/src/bank-lib/testing_api_cmd_history.c @@ -686,7 +686,7 @@ history_cb (void *cls, * @param cmd the command to execute. * @param is the interpreter state. */ -void +static void history_run (void *cls, const struct TALER_TESTING_Command *cmd, struct TALER_TESTING_Interpreter *is) @@ -738,7 +738,7 @@ history_run (void *cls, * @param cls closure. * @param cmd the command which is being cleaned up. */ -void +static void history_cleanup (void *cls, const struct TALER_TESTING_Command *cmd) diff --git a/src/bank-lib/testing_api_cmd_reject.c b/src/bank-lib/testing_api_cmd_reject.c index b929e262d..d2fffb865 100644 --- a/src/bank-lib/testing_api_cmd_reject.c +++ b/src/bank-lib/testing_api_cmd_reject.c @@ -94,7 +94,7 @@ reject_cb (void *cls, * @param cls closure. * @param cmd the command. */ -void +static void reject_cleanup (void *cls, const struct TALER_TESTING_Command *cmd) @@ -117,7 +117,7 @@ reject_cleanup * @param cmd the command to execute. * @param is the interpreter state. */ -void +static void reject_run (void *cls, const struct TALER_TESTING_Command *cmd, struct TALER_TESTING_Interpreter *is) diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c index 026fa87aa..811d4bd5d 100644 --- a/src/exchange-lib/exchange_api_handle.c +++ b/src/exchange-lib/exchange_api_handle.c @@ -1131,6 +1131,9 @@ request_keys (struct TALER_EXCHANGE_Handle *exchange) { char *arg; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Doing cherry-picking\n"); + GNUNET_asprintf (&arg, "/keys?last_issue_date=%llu", (unsigned long long) exchange->key_data.last_denom_issue_date.abs_value_us / 1000000LLU); diff --git a/src/exchange-lib/testing_api_cmd_bank_check.c b/src/exchange-lib/testing_api_cmd_bank_check.c index b4f5fff42..8bfb12b7c 100644 --- a/src/exchange-lib/testing_api_cmd_bank_check.c +++ b/src/exchange-lib/testing_api_cmd_bank_check.c @@ -89,7 +89,7 @@ struct BankCheckState * @param cmd the command to execute. * @param is the interpreter state. */ -void +static void check_bank_transfer_run (void *cls, const struct TALER_TESTING_Command *cmd, struct TALER_TESTING_Interpreter *is) @@ -178,7 +178,7 @@ check_bank_transfer_run (void *cls, * @param cls closure. * @param cmd the command which is being cleaned up. */ -void +static void check_bank_transfer_cleanup (void *cls, const struct TALER_TESTING_Command *cmd) @@ -279,7 +279,7 @@ TALER_TESTING_cmd_check_bank_transfer * @param cls closure. * @param cmd the command which is being cleaned up. */ -void +static void check_bank_empty_cleanup (void *cls, const struct TALER_TESTING_Command *cmd) @@ -294,7 +294,7 @@ check_bank_empty_cleanup * @param cmd the command to execute. * @param is the interpreter state. */ -void +static void check_bank_empty_run (void *cls, const struct TALER_TESTING_Command *cmd, struct TALER_TESTING_Interpreter *is) diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index 042773bf9..409e55b47 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c @@ -2052,6 +2052,7 @@ TEH_KS_handler_keys (struct TEH_RequestHandler *rh, key_state->krd_array_length, sizeof (struct KeysResponseData), &krd_search_comparator); + if ( (NULL == krd) && (key_state->krd_array_length > 0) ) { diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index e72e96cc9..f20a887a1 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -2779,6 +2779,7 @@ postgres_get_ready_deposit (void *cls, rs); if (qs <= 0) return qs; + qs = deposit_cb (deposit_cb_cls, serial_id, &merchant_pub, |