aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2024-11-09 20:34:43 +0100
committerChristian Grothoff <christian@grothoff.org>2024-11-09 20:34:43 +0100
commite48768c3c65437c11bed0b56541d60acb3b0ea14 (patch)
tree5db978f5f37faf8d4f51385ff46ce3c328436cf7
parentc1be508a35610f9678cb372208fe8bc9da563b1f (diff)
fix KYC test regressions
-rw-r--r--src/exchange/taler-exchange-httpd_kyc-proof.c2
-rw-r--r--src/exchangedb/0007-batch_deposits.sql51
-rw-r--r--src/testing/test_exchange_api.conf12
3 files changed, 60 insertions, 5 deletions
diff --git a/src/exchange/taler-exchange-httpd_kyc-proof.c b/src/exchange/taler-exchange-httpd_kyc-proof.c
index 2ff9a865b..7bf0560cf 100644
--- a/src/exchange/taler-exchange-httpd_kyc-proof.c
+++ b/src/exchange/taler-exchange-httpd_kyc-proof.c
@@ -249,7 +249,7 @@ proof_finish (
kpc->proof_response = NULL;
kpc->proof_response_code = 0;
}
- GNUNET_assert (NULL == kpc->response);
+ GNUNET_assert (NULL != kpc->response);
kpc_resume (kpc);
}
diff --git a/src/exchangedb/0007-batch_deposits.sql b/src/exchangedb/0007-batch_deposits.sql
new file mode 100644
index 000000000..65055f6ad
--- /dev/null
+++ b/src/exchangedb/0007-batch_deposits.sql
@@ -0,0 +1,51 @@
+--
+-- This file is part of TALER
+-- Copyright (C) 2024 Taler Systems SA
+--
+-- TALER is free software; you can redistribute it and/or modify it under the
+-- terms of the GNU General Public License as published by the Free Software
+-- Foundation; either version 3, or (at your option) any later version.
+--
+-- TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+-- A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License along with
+-- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
+--
+
+CREATE FUNCTION alter_table_batch_deposits7()
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ table_name TEXT DEFAULT 'batch_deposits';
+BEGIN
+ EXECUTE FORMAT (
+ 'ALTER TABLE ' || table_name ||
+ ' ADD COLUMN merchant_sig BYTEA CHECK(LENGTH(merchant_sig)=64)'
+ ' DEFAULT NULL'
+ ';'
+ );
+
+ PERFORM comment_partitioned_column(
+ 'signature by the merchant over the contract terms'
+ ,'batch_deposits'
+ ,'merchant_sig'
+ ,NULL
+ );
+END $$;
+
+
+INSERT INTO exchange_tables
+ (name
+ ,version
+ ,action
+ ,partitioned
+ ,by_range)
+ VALUES
+ ('batch_deposits7'
+ ,'exchange-0007'
+ ,'alter'
+ ,TRUE
+ ,FALSE);
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 0bbf5cea8..a0d9f75f9 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -171,11 +171,11 @@ REQUIRES =
FALLBACK = manual-freeze
[kyc-measure-info-frozen]
-CHECK_NAME = kyc-check-info-frozen
+CHECK_NAME = info-frozen
# No context
CONTEXT = {}
# Command if INFO check will never be run.
-COMMAND = taler-exchange-helper-measure-none
+PROGRAM = none
# If this "check" is triggered, we merely inform
# the user that we got their oauth-test data on file.
@@ -193,12 +193,16 @@ FALLBACK = manual-freeze
[kyc-measure-info-oauth-test-passed]
-CHECK_NAME = kyc-check-info-oauth-test-passed
+CHECK_NAME = info-oauth-test-passed
# No context
CONTEXT = {}
# Command if INFO check will never be run.
-COMMAND = taler-exchange-helper-measure-none
+PROGRAM = none
+[aml-program-none]
+DESCRIPTION = "Dummy AML program used for INFO checks, always fails"
+COMMAND = taler-exchange-helper-measure-none
+FALLBACK = manual-freeze
[aml-program-oauth-output-check]
DESCRIPTION = "Validates the output from OAauth2 and then increases all limits to EUR:1000"