aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/Makefile.am3
-rw-r--r--src/testing/test_auditor_api_expire_reserve_now-cs.conf (renamed from src/testing/test_auditor_api_expire_reserve_now.conf)2
-rw-r--r--src/testing/test_auditor_api_expire_reserve_now-rsa.conf4
-rw-r--r--src/testing/testing_api_cmd_refresh.c16
4 files changed, 22 insertions, 3 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index ae0d67b61..16c7a563f 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -484,7 +484,8 @@ test_kyc_api_LDADD = \
EXTRA_DIST = \
test_auditor_api.conf \
- test_auditor_api_expire_reserve_now.conf \
+ test_auditor_api_expire_reserve_now-cs.conf \
+ test_auditor_api_expire_reserve_now-rsa.conf \
test_bank_api_fakebank.conf \
test_bank_api_fakebank_twisted.conf \
test_bank_api_pybank.conf \
diff --git a/src/testing/test_auditor_api_expire_reserve_now.conf b/src/testing/test_auditor_api_expire_reserve_now-cs.conf
index c2bf8f479..7277a0dff 100644
--- a/src/testing/test_auditor_api_expire_reserve_now.conf
+++ b/src/testing/test_auditor_api_expire_reserve_now-cs.conf
@@ -1,4 +1,4 @@
-@INLINE@ test_auditor_api.conf
+@INLINE@ test_auditor_api-cs.conf
[exchangedb]
IDLE_RESERVE_EXPIRATION_TIME = 0 s
diff --git a/src/testing/test_auditor_api_expire_reserve_now-rsa.conf b/src/testing/test_auditor_api_expire_reserve_now-rsa.conf
new file mode 100644
index 000000000..788cc36f8
--- /dev/null
+++ b/src/testing/test_auditor_api_expire_reserve_now-rsa.conf
@@ -0,0 +1,4 @@
+@INLINE@ test_auditor_api-rsa.conf
+
+[exchangedb]
+IDLE_RESERVE_EXPIRATION_TIME = 0 s
diff --git a/src/testing/testing_api_cmd_refresh.c b/src/testing/testing_api_cmd_refresh.c
index dd70b438a..07476a7b3 100644
--- a/src/testing/testing_api_cmd_refresh.c
+++ b/src/testing/testing_api_cmd_refresh.c
@@ -122,6 +122,12 @@ struct RefreshMeltState
struct TALER_ExchangeWithdrawValues *alg_values;
/**
+ * Array of @a num_fresh_coins of blinding key secrets
+ * created during the melt operation.
+ */
+ union TALER_DenominationBlindingKeyP *bks;
+
+ /**
* Entropy seed for the refresh-melt operation.
*/
struct TALER_PlanchetSecretsP ps;
@@ -970,6 +976,11 @@ melt_cb (void *cls,
memcpy (rms->alg_values,
alg_values,
num_coins * sizeof (struct TALER_ExchangeWithdrawValues));
+ rms->bks = GNUNET_new_array (num_coins,
+ union TALER_DenominationBlindingKeyP);
+ memcpy (rms->bks,
+ bks,
+ num_coins * sizeof (union TALER_DenominationBlindingKeyP));
}
if (0 != rms->total_backoff.rel_value_us)
{
@@ -1055,7 +1066,6 @@ melt_run (void *cls,
TALER_TESTING_interpreter_fail (rms->is);
return;
}
-
if (GNUNET_OK !=
TALER_TESTING_get_trait_denom_sig (coin_command,
0,
@@ -1172,6 +1182,7 @@ melt_cleanup (void *cls,
GNUNET_free (rms->fresh_pks);
}
GNUNET_free (rms->alg_values);
+ GNUNET_free (rms->bks);
GNUNET_free (rms->melt_fresh_amounts);
GNUNET_free (rms);
}
@@ -1205,6 +1216,9 @@ melt_traits (void *cls,
&rms->fresh_pks[index]),
TALER_TESTING_make_trait_coin_priv (0,
rms->melt_priv),
+ // ????
+ TALER_TESTING_make_trait_blinding_key (index,
+ &rms->bks[index]),
TALER_TESTING_trait_end ()
};