aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/Makefile.am2
-rw-r--r--src/testing/testing_api_cmd_reserve_attest.c45
-rw-r--r--src/testing/testing_api_cmd_reserve_get_attestable.c81
3 files changed, 93 insertions, 35 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 78d4cdce..256276ce 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -85,7 +85,9 @@ libtalertesting_la_SOURCES = \
testing_api_cmd_recoup_refresh.c \
testing_api_cmd_refund.c \
testing_api_cmd_refresh.c \
+ testing_api_cmd_reserve_attest.c \
testing_api_cmd_reserve_get.c \
+ testing_api_cmd_reserve_get_attestable.c \
testing_api_cmd_reserve_history.c \
testing_api_cmd_reserve_open.c \
testing_api_cmd_reserve_purse.c \
diff --git a/src/testing/testing_api_cmd_reserve_attest.c b/src/testing/testing_api_cmd_reserve_attest.c
index 8ed95924..5ed25c13 100644
--- a/src/testing/testing_api_cmd_reserve_attest.c
+++ b/src/testing/testing_api_cmd_reserve_attest.c
@@ -26,7 +26,6 @@
#include <gnunet/gnunet_curl_lib.h>
#include "taler_testing_lib.h"
-
/**
* State for a "attest" CMD.
*/
@@ -44,11 +43,6 @@ struct AttestState
struct TALER_EXCHANGE_ReservesAttestHandle *rsh;
/**
- * Expected reserve balance.
- */
- const char *expected_balance;
-
- /**
* Private key of the reserve being analyzed.
*/
const struct TALER_ReservePrivateKeyP *reserve_priv;
@@ -59,6 +53,16 @@ struct AttestState
struct TALER_ReservePublicKeyP reserve_pub;
/**
+ * Array of attributes to request, of length @e attrs_len.
+ */
+ const char **attrs;
+
+ /**
+ * Length of the @e attrs array.
+ */
+ unsigned int attrs_len;
+
+ /**
* Expected HTTP response code.
*/
unsigned int expected_response_code;
@@ -78,12 +82,12 @@ struct AttestState
* @param rs HTTP response details
*/
static void
-reserve_attest_cb (void *cls,
- const struct TALER_EXCHANGE_ReserveAttest *rs)
+reserve_attest_cb (
+ void *cls,
+ const struct TALER_EXCHANGE_ReservePostAttestResult *rs)
{
struct AttestState *ss = cls;
struct TALER_TESTING_Interpreter *is = ss->is;
- struct TALER_Amount eb;
ss->rsh = NULL;
if (ss->expected_response_code != rs->hr.http_status)
@@ -104,6 +108,7 @@ reserve_attest_cb (void *cls,
TALER_TESTING_interpreter_next (is);
return;
}
+ /* FIXME: persist attestation... */
TALER_TESTING_interpreter_next (is);
}
@@ -147,6 +152,8 @@ attest_run (void *cls,
&ss->reserve_pub.eddsa_pub);
ss->rsh = TALER_EXCHANGE_reserves_attest (is->exchange,
ss->reserve_priv,
+ ss->attrs_len,
+ ss->attrs,
&reserve_attest_cb,
ss);
}
@@ -174,6 +181,7 @@ attest_cleanup (void *cls,
TALER_EXCHANGE_reserves_attest_cancel (ss->rsh);
ss->rsh = NULL;
}
+ GNUNET_free (ss->attrs);
GNUNET_free (ss);
}
@@ -185,12 +193,29 @@ TALER_TESTING_cmd_reserve_attest (const char *label,
...)
{
struct AttestState *ss;
+ unsigned int num_args;
+ const char *ea;
+ va_list ap;
+
+ num_args = 0;
+ va_start (ap, expected_response_code);
+ while (NULL != va_arg (ap, const char *))
+ num_args++;
+ va_end (ap);
GNUNET_assert (NULL != reserve_reference);
ss = GNUNET_new (struct AttestState);
ss->reserve_reference = reserve_reference;
- ss->expected_balance = expected_balance;
ss->expected_response_code = expected_response_code;
+ ss->attrs_len = num_args;
+ ss->attrs = GNUNET_new_array (num_args,
+ const char *);
+ num_args = 0;
+ va_start (ap, expected_response_code);
+ while (NULL != (ea = va_arg (ap, const char *)))
+ ss->attrs[num_args++] = ea;
+ va_end (ap);
+
{
struct TALER_TESTING_Command cmd = {
.cls = ss,
diff --git a/src/testing/testing_api_cmd_reserve_get_attestable.c b/src/testing/testing_api_cmd_reserve_get_attestable.c
index c0cae832..29c8f6a3 100644
--- a/src/testing/testing_api_cmd_reserve_get_attestable.c
+++ b/src/testing/testing_api_cmd_reserve_get_attestable.c
@@ -41,17 +41,17 @@ struct GetAttestableState
/**
* Handle to the "reserve get_attestable" operation.
*/
- struct TALER_EXCHANGE_ReservesGetAttestableHandle *rsh;
+ struct TALER_EXCHANGE_ReservesGetAttestHandle *rgah;
/**
- * Expected reserve balance.
+ * Expected attestable attributes.
*/
- const char *expected_balance;
+ const char **expected_attestables;
/**
- * Private key of the reserve being analyzed.
+ * Length of the @e expected_attestables array.
*/
- const struct TALER_ReservePrivateKeyP *reserve_priv;
+ unsigned int expected_attestables_length;
/**
* Public key of the reserve being analyzed.
@@ -78,14 +78,14 @@ struct GetAttestableState
* @param rs HTTP response details
*/
static void
-reserve_get_attestable_cb (void *cls,
- const struct TALER_EXCHANGE_ReserveGetAttestable *rs)
+reserve_get_attestable_cb (
+ void *cls,
+ const struct TALER_EXCHANGE_ReserveGetAttestResult *rs)
{
struct GetAttestableState *ss = cls;
struct TALER_TESTING_Interpreter *is = ss->is;
- struct TALER_Amount eb;
- ss->rsh = NULL;
+ ss->rgah = NULL;
if (ss->expected_response_code != rs->hr.http_status)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -104,6 +104,7 @@ reserve_get_attestable_cb (void *cls,
TALER_TESTING_interpreter_next (is);
return;
}
+ // FIXME: check returned list matches expectations!
TALER_TESTING_interpreter_next (is);
}
@@ -122,6 +123,8 @@ get_attestable_run (void *cls,
{
struct GetAttestableState *ss = cls;
const struct TALER_TESTING_Command *create_reserve;
+ const struct TALER_ReservePrivateKeyP *reserve_priv;
+ const struct TALER_ReservePublicKeyP *reserve_pub;
ss->is = is;
create_reserve
@@ -134,21 +137,31 @@ get_attestable_run (void *cls,
TALER_TESTING_interpreter_fail (is);
return;
}
- if (GNUNET_OK !=
+ if (GNUNET_OK ==
TALER_TESTING_get_trait_reserve_priv (create_reserve,
- &ss->reserve_priv))
+ &reserve_priv))
{
- GNUNET_break (0);
- TALER_LOG_ERROR ("Failed to find reserve_priv for get_attestable query\n");
- TALER_TESTING_interpreter_fail (is);
- return;
+ GNUNET_CRYPTO_eddsa_key_get_public (&reserve_priv->eddsa_priv,
+ &ss->reserve_pub.eddsa_pub);
}
- GNUNET_CRYPTO_eddsa_key_get_public (&ss->reserve_priv->eddsa_priv,
- &ss->reserve_pub.eddsa_pub);
- ss->rsh = TALER_EXCHANGE_reserves_get_attestable (is->exchange,
- ss->reserve_priv,
- &reserve_get_attestable_cb,
- ss);
+ else
+ {
+ if (GNUNET_OK !=
+ TALER_TESTING_get_trait_reserve_pub (create_reserve,
+ &reserve_pub))
+ {
+ GNUNET_break (0);
+ TALER_LOG_ERROR (
+ "Failed to find reserve_priv for get_attestable query\n");
+ TALER_TESTING_interpreter_fail (is);
+ return;
+ }
+ ss->reserve_pub = *reserve_pub;
+ }
+ ss->rgah = TALER_EXCHANGE_reserves_get_attestable (is->exchange,
+ &ss->reserve_pub,
+ &reserve_get_attestable_cb,
+ ss);
}
@@ -165,15 +178,16 @@ get_attestable_cleanup (void *cls,
{
struct GetAttestableState *ss = cls;
- if (NULL != ss->rsh)
+ if (NULL != ss->rgah)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Command %u (%s) did not complete\n",
ss->is->ip,
cmd->label);
- TALER_EXCHANGE_reserves_get_attestable_cancel (ss->rsh);
- ss->rsh = NULL;
+ TALER_EXCHANGE_reserves_get_attestable_cancel (ss->rgah);
+ ss->rgah = NULL;
}
+ GNUNET_free (ss->expected_attestables);
GNUNET_free (ss);
}
@@ -185,12 +199,29 @@ TALER_TESTING_cmd_reserve_get_attestable (const char *label,
...)
{
struct GetAttestableState *ss;
+ va_list ap;
+ unsigned int num_expected;
+ const char *ea;
+
+ num_expected = 0;
+ va_start (ap, expected_response_code);
+ while (NULL != va_arg (ap, const char *))
+ num_expected++;
+ va_end (ap);
GNUNET_assert (NULL != reserve_reference);
ss = GNUNET_new (struct GetAttestableState);
ss->reserve_reference = reserve_reference;
- ss->expected_balance = expected_balance;
ss->expected_response_code = expected_response_code;
+ ss->expected_attestables_length = num_expected;
+ ss->expected_attestables = GNUNET_new_array (num_expected,
+ const char *);
+ num_expected = 0;
+ va_start (ap, expected_response_code);
+ while (NULL != (ea = va_arg (ap, const char *)))
+ ss->expected_attestables[num_expected++] = ea;
+ va_end (ap);
+
{
struct TALER_TESTING_Command cmd = {
.cls = ss,
generated by cgit v1.2.3 (git 2.39.1) at 2025-09-11 12:40:17 +0000