[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 03/04: fix merge conflict
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 03/04: fix merge conflict |
|
Date: |
Sun, 19 Jan 2020 17:14:22 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit b6543b8f9a0ef4de473568ba27e05ba50442ee97
Merge: 707449aa fc8bdb9b
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jan 19 17:04:35 2020 +0100
fix merge conflict
src/auditor/generate-auditor-basedb.conf | 4 +-
src/auditor/taler-wire-auditor.c | 10 ++---
src/auditor/test-auditor.conf | 2 +-
src/bank-lib/taler-bank-transfer.c | 2 +-
src/benchmark/benchmark.conf | 2 +-
src/benchmark/taler-exchange-benchmark.c | 9 ++---
src/exchange-tools/taler-exchange-wire.c | 2 +-
src/exchange/taler-exchange-httpd_validation.c | 6 +--
src/exchange/test_taler_exchange_httpd.conf | 9 +----
src/exchangedb/exchangedb_accounts.c | 14 +++----
src/exchangedb/test_exchangedb.c | 6 +--
src/include/taler_crypto_lib.h | 28 +++++++-------
src/include/taler_exchange_service.h | 6 +--
src/include/taler_exchangedb_lib.h | 2 +-
src/include/taler_json_lib.h | 4 +-
src/include/taler_util.h | 8 ++--
src/json/json_wire.c | 26 ++++++-------
src/lib/exchange_api_handle.c | 4 +-
src/lib/exchange_api_wire.c | 4 +-
.../test-taler-exchange-aggregator-postgres.conf | 2 +-
.../test-taler-exchange-wirewatch-postgres.conf | 2 +-
src/testing/test_auditor_api.conf | 4 +-
src/testing/test_bank_api_fakebank.conf | 2 +-
src/testing/test_bank_api_fakebank_twisted.conf | 4 +-
src/testing/test_bank_api_pybank.conf | 2 +-
src/testing/test_bank_api_pybank_twisted.conf | 4 +-
src/testing/test_exchange_api.conf | 4 +-
.../.config/taler/account-1.json | 5 ---
.../.config/taler/account-2.json | 2 +-
.../test_exchange_api_home/.config/taler/test.json | 8 ----
.../.config/taler/x-taler-bank.json | 5 ---
.../test_exchange_api_keys_cherry_picking.conf | 4 +-
.../.config/taler/x-taler-bank.json | 2 +-
src/testing/test_exchange_api_twisted.conf | 4 +-
.../.config/taler/account-1.json | 2 +-
src/testing/testing_api_cmd_insert_deposit.c | 2 +-
src/testing/testing_api_cmd_wire.c | 2 +-
src/testing/testing_api_helpers_bank.c | 10 ++---
src/util/crypto_wire.c | 44 +++++++++++-----------
src/util/util.c | 12 +++---
40 files changed, 124 insertions(+), 150 deletions(-)
diff --cc src/benchmark/taler-exchange-benchmark.c
index cd21507f,e9212ccf..a4249b36
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@@ -312,22 -306,24 +312,21 @@@ run (void *cls
"{\"nonce\": %llu}",
i + (howmany_coins * j));
unit[0] =
- TALER_TESTING_cmd_withdraw_with_retry
- (TALER_TESTING_cmd_withdraw_amount
- (withdraw_label,
- create_reserve_label,
- AMOUNT_5,
- MHD_HTTP_OK));
+ TALER_TESTING_cmd_withdraw_with_retry
(TALER_TESTING_cmd_withdraw_amount
+ (withdraw_label,
+ create_reserve_label,
+ amount_5,
+ MHD_HTTP_OK));
unit[1] =
TALER_TESTING_cmd_deposit_with_retry
- (TALER_TESTING_cmd_deposit
- ("deposit",
- withdraw_label,
- 0, /* Index of the one withdrawn coin in the traits. */
- user_payto_uri,
- order_enc,
- GNUNET_TIME_UNIT_ZERO,
- AMOUNT_1,
- MHD_HTTP_OK));
-
+ (TALER_TESTING_cmd_deposit ("deposit",
+ withdraw_label,
+ 0, /* Index of the one withdrawn coin
in the traits. */
- user_payto_url,
++ user_payto_uri,
+ order_enc,
+ GNUNET_TIME_UNIT_ZERO,
+ amount_1,
+ MHD_HTTP_OK));
-
if (eval_probability (refresh_rate / 100.0))
{
char *melt_label;
--
To stop receiving notification emails like this one, please contact
address@hidden.