[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: adjust to latest exchange change
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: adjust to latest exchange changes |
|
Date: |
Tue, 01 Nov 2022 16:44:45 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new b748bbaf adjust to latest exchange changes
b748bbaf is described below
commit b748bbaf540f72cb40d1bbf71c4c91b5e44186ea
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Nov 1 16:42:35 2022 +0100
adjust to latest exchange changes
---
src/backend/taler-merchant-httpd_private-post-transfers.c | 2 --
src/backenddb/merchant-0003.sql | 3 +++
src/backenddb/plugin_merchantdb_postgres.c | 9 +--------
src/backenddb/test_merchantdb.c | 3 ---
src/testing/initialize_taler_system.sh | 4 ++--
src/testing/test_kyc_api.c | 1 -
src/testing/test_merchant_api.c | 1 -
src/testing/test_merchant_api_twisted.c | 1 -
8 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c
b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 15efeb3c..aa21c747 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -439,8 +439,6 @@ check_wire_fee (struct PostTransfersContext *ptc,
&fees.wire),
TALER_JSON_pack_amount ("expected_closing_fee",
&fees.closing),
- TALER_JSON_pack_amount ("expected_wad_fee",
- &fees.wad),
GNUNET_JSON_pack_timestamp ("start_date",
start_date),
GNUNET_JSON_pack_timestamp ("end_date",
diff --git a/src/backenddb/merchant-0003.sql b/src/backenddb/merchant-0003.sql
index 9c55002d..66e53f66 100644
--- a/src/backenddb/merchant-0003.sql
+++ b/src/backenddb/merchant-0003.sql
@@ -22,6 +22,9 @@ BEGIN;
SET search_path TO merchant;
+ALTER TABLE merchant_exchange_wire_fees
+ DROP COLUMN wad_fee_val,
+ DROP COLUMN wad_fee_frac;
-- Complete transaction
COMMIT;
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 8e1491b3..8d69551c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -4299,8 +4299,6 @@ postgres_lookup_wire_fee (void *cls,
&fees->wire),
TALER_PQ_RESULT_SPEC_AMOUNT ("closing_fee",
&fees->closing),
- TALER_PQ_RESULT_SPEC_AMOUNT ("wad_fee",
- &fees->wad),
GNUNET_PQ_result_spec_timestamp ("start_date",
start_date),
GNUNET_PQ_result_spec_timestamp ("end_date",
@@ -5117,7 +5115,6 @@ postgres_store_wire_fee_by_exchange (
GNUNET_PQ_query_param_auto_from_type (h_wire_method),
TALER_PQ_query_param_amount (&fees->wire),
TALER_PQ_query_param_amount (&fees->closing),
- TALER_PQ_query_param_amount (&fees->wad),
GNUNET_PQ_query_param_timestamp (&start_date),
GNUNET_PQ_query_param_timestamp (&end_date),
GNUNET_PQ_query_param_auto_from_type (master_sig),
@@ -8571,8 +8568,6 @@ postgres_connect (void *cls)
",wire_fee_frac"
",closing_fee_val"
",closing_fee_frac"
- ",wad_fee_val"
- ",wad_fee_frac"
",start_date"
",end_date"
",master_sig"
@@ -8871,13 +8866,11 @@ postgres_connect (void *cls)
",wire_fee_frac"
",closing_fee_val"
",closing_fee_frac"
- ",wad_fee_val"
- ",wad_fee_frac"
",start_date"
",end_date"
",master_sig)"
" VALUES "
- "($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)"),
+ "($1, $2, $3, $4, $5, $6, $7, $8, $9)"),
/* For postgres_insert_reserve() */
GNUNET_PQ_make_prepare ("insert_reserve",
"INSERT INTO merchant_tip_reserves"
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index 1bfaac61..19005d41 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -3302,9 +3302,6 @@ make_wire_fee (const struct ExchangeSignkeyData *signkey,
GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount ("EUR:0.49",
&wire_fee->fees.closing));
- GNUNET_assert (GNUNET_OK ==
- TALER_string_to_amount ("EUR:0.49",
- &wire_fee->fees.wad));
wire_fee->wire_fee_start = GNUNET_TIME_timestamp_get ();
wire_fee->wire_fee_end = GNUNET_TIME_relative_to_timestamp (
GNUNET_TIME_UNIT_MONTHS);
diff --git a/src/testing/initialize_taler_system.sh
b/src/testing/initialize_taler_system.sh
index f36fd2e7..693e6513 100755
--- a/src/testing/initialize_taler_system.sh
+++ b/src/testing/initialize_taler_system.sh
@@ -249,8 +249,8 @@ taler-exchange-offline -c $CONF \
sign \
enable-account `taler-config -c $CONF -s exchange-account-1 -o PAYTO_URI` \
enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \
- wire-fee now iban TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 \
- global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01
1h 1h 1year 5 \
+ wire-fee now iban TESTKUDOS:0.01 TESTKUDOS:0.01 \
+ global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1year 5 \
upload &> taler-exchange-offline.log
echo -n "."
diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c
index 7c8e4901..268b042c 100644
--- a/src/testing/test_kyc_api.c
+++ b/src/testing/test_kyc_api.c
@@ -290,7 +290,6 @@ run (void *cls,
TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
CONFIG_FILE,
"EUR:0.01",
- "EUR:0.01",
"EUR:0.01"),
TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
1),
diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index 638c43d7..9759f417 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -1307,7 +1307,6 @@ run (void *cls,
TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
config_file,
"EUR:0.01",
- "EUR:0.01",
"EUR:0.01"),
TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
1),
diff --git a/src/testing/test_merchant_api_twisted.c
b/src/testing/test_merchant_api_twisted.c
index e80d6bb4..73b6905b 100644
--- a/src/testing/test_merchant_api_twisted.c
+++ b/src/testing/test_merchant_api_twisted.c
@@ -337,7 +337,6 @@ run (void *cls,
TALER_TESTING_cmd_exec_offline_sign_fees ("offline-sign-fees",
config_file,
"EUR:0.01",
- "EUR:0.01",
"EUR:0.01"),
TALER_TESTING_cmd_check_keys_pull_all_keys ("refetch /keys",
1),
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: adjust to latest exchange changes,
gnunet <=