summaryrefslogtreecommitdiff
path: root/src/exchange-lib
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-01-09 13:45:47 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2019-01-09 13:45:47 +0100
commitec581884469ad03da0725893345edff71532845e (patch)
treebfcab03c82ce933ffae480c44a2fb2bc816ccbf8 /src/exchange-lib
parentcf539c03c63043c349415fa1e62232ef81b6de7e (diff)
downloadexchange-ec581884469ad03da0725893345edff71532845e.tar.gz
exchange-ec581884469ad03da0725893345edff71532845e.tar.bz2
exchange-ec581884469ad03da0725893345edff71532845e.zip
Generating additional DKs after serialized state import.
Diffstat (limited to 'src/exchange-lib')
-rw-r--r--src/exchange-lib/exchange_api_handle.c2
-rw-r--r--src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf5
-rw-r--r--src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c15
3 files changed, 19 insertions, 3 deletions
diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c
index 174dc2b47..c764b9ec5 100644
--- a/src/exchange-lib/exchange_api_handle.c
+++ b/src/exchange-lib/exchange_api_handle.c
@@ -469,7 +469,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
kv.expire_deposit = GNUNET_TIME_absolute_hton (dk->expire_deposit);
kv.expire_legal = GNUNET_TIME_absolute_hton (dk->expire_legal);
TALER_amount_hton (&kv.value,
- &dk->value);
+ &dk->value);
TALER_amount_hton (&kv.fee_withdraw,
&dk->fee_withdraw);
TALER_amount_hton (&kv.fee_deposit,
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf b/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf
new file mode 100644
index 000000000..694f78ddd
--- /dev/null
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking_extended_2.conf
@@ -0,0 +1,5 @@
+@INLINE@ test_exchange_api_keys_cherry_picking_extended.conf
+
+[exchange]
+# Lengthen over firstly extended value (100 s)
+LOOKAHEAD_SIGN = 150 s
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c b/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
index bac4a7198..31e41b4cc 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
@@ -48,6 +48,12 @@
"test_exchange_api_keys_cherry_picking_extended.conf"
/**
+ * Used to increase the number of denomination keys.
+ */
+#define CONFIG_FILE_EXTENDED_2 \
+ "test_exchange_api_keys_cherry_picking_extended_2.conf"
+
+/**
* Exchange base URL; mainly purpose is to make the compiler happy.
*/
static char *exchange_url;
@@ -86,7 +92,12 @@ run (void *cls,
"x-taler-bank",
NULL,
MHD_HTTP_OK),
-
+
+ TALER_TESTING_cmd_exec_keyup ("keyup-serialization",
+ CONFIG_FILE_EXTENDED_2),
+
+ TALER_TESTING_cmd_exec_auditor_sign ("auditor-sign-serialization",
+ CONFIG_FILE_EXTENDED_2),
TALER_TESTING_cmd_end ()
};
@@ -108,7 +119,7 @@ run (void *cls,
CONFIG_FILE_EXTENDED),
TALER_TESTING_cmd_exec_auditor_sign ("sign-keys-1",
- CONFIG_FILE),
+ CONFIG_FILE_EXTENDED),
/* Cause exchange to reload (new) keys */
TALER_TESTING_cmd_signal ("trigger-keys-reload-1",