summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-01-24 17:53:10 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2019-01-24 17:53:10 +0100
commit862ed50d7db6dad591bee045a7864e8310f1fbcc (patch)
tree480da4a128a54e9f0829dcaab52aed377327b666 /src/lib
parent16002d20785785c03647d1648501aac3e9ce38bb (diff)
downloadexchange-862ed50d7db6dad591bee045a7864e8310f1fbcc.tar.gz
exchange-862ed50d7db6dad591bee045a7864e8310f1fbcc.tar.bz2
exchange-862ed50d7db6dad591bee045a7864e8310f1fbcc.zip
Auditor tests.
Fix double connection.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/auditor_api_handle.c3
-rw-r--r--src/lib/exchange_api_handle.c9
-rw-r--r--src/lib/test_auditor_api.c4
-rw-r--r--src/lib/testing_api_loop.c1
-rw-r--r--src/lib/testing_auditor_api_helpers.c34
5 files changed, 19 insertions, 32 deletions
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index 652566c05..dc60fc869 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -447,6 +447,9 @@ TALER_AUDITOR_connect (struct GNUNET_CURL_Context *ctx,
{
struct TALER_AUDITOR_Handle *auditor;
+ TALER_LOG_DEBUG ("Connecting to the auditor (%s)\n",
+ url);
+
auditor = GNUNET_new (struct TALER_AUDITOR_Handle);
auditor->ctx = ctx;
auditor->url = GNUNET_strdup (url);
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 61b34fc87..78219e611 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -685,8 +685,11 @@ update_auditors (struct TALER_EXCHANGE_Handle *exchange)
{
struct TALER_EXCHANGE_Keys *kd = &exchange->key_data;
+ TALER_LOG_DEBUG ("Updating auditors\n");
for (unsigned int i=0;i<kd->num_auditors;i++)
{
+ /* Compare auditor data from /keys with auditor data
+ * from owned exchange structures. */
struct TALER_EXCHANGE_AuditorInformation *auditor = &kd->auditors[i];
struct TEAH_AuditorListEntry *ale = NULL;
@@ -704,7 +707,9 @@ update_auditors (struct TALER_EXCHANGE_Handle *exchange)
}
if (NULL != ale)
continue; /* found, no need to add */
+
/* new auditor, add */
+ TALER_LOG_DEBUG ("Found new auditor!\n");
ale = GNUNET_new (struct TEAH_AuditorListEntry);
ale->auditor_pub = auditor->auditor_pub;
ale->auditor_url = GNUNET_strdup (auditor->auditor_url);
@@ -1206,6 +1211,7 @@ keys_completed_cb (void *cls,
aold->num_denom_keys * sizeof (struct TALER_EXCHANGE_AuditorDenominationInfo));
}
+ /* Old auditors got just copied into new ones. */
if (GNUNET_OK !=
decode_keys_json (j,
GNUNET_YES,
@@ -1728,6 +1734,9 @@ TALER_EXCHANGE_connect
va_list ap;
enum TALER_EXCHANGE_Option opt;
+ TALER_LOG_DEBUG ("Connecting to the exchange (%s)\n",
+ url);
+
exchange = GNUNET_new (struct TALER_EXCHANGE_Handle);
exchange->ctx = ctx;
exchange->url = GNUNET_strdup (url);
diff --git a/src/lib/test_auditor_api.c b/src/lib/test_auditor_api.c
index cddd21197..04fbaa58e 100644
--- a/src/lib/test_auditor_api.c
+++ b/src/lib/test_auditor_api.c
@@ -471,6 +471,8 @@ run (void *cls,
};
struct TALER_TESTING_Command commands[] = {
+
+ #if 0
CMD_RUN_AUDITOR("virgin-auditor"),
CMD_RUN_WIRE_AUDITOR("virgin-wire-auditor"),
TALER_TESTING_cmd_batch ("withdraw",
@@ -489,6 +491,8 @@ run (void *cls,
payback),
CMD_RUN_AUDITOR("normal-auditor"),
CMD_RUN_WIRE_AUDITOR("normal-wire-auditor"),
+ #endif
+
TALER_TESTING_cmd_end ()
};
diff --git a/src/lib/testing_api_loop.c b/src/lib/testing_api_loop.c
index d0865c905..0582b73ba 100644
--- a/src/lib/testing_api_loop.c
+++ b/src/lib/testing_api_loop.c
@@ -309,6 +309,7 @@ do_shutdown (void *cls)
if (NULL != is->exchange)
{
+ TALER_LOG_DEBUG ("Disconnecting the exchange\n");
TALER_EXCHANGE_disconnect (is->exchange);
is->exchange = NULL;
}
diff --git a/src/lib/testing_auditor_api_helpers.c b/src/lib/testing_auditor_api_helpers.c
index 7e7103150..c85fe47b7 100644
--- a/src/lib/testing_auditor_api_helpers.c
+++ b/src/lib/testing_auditor_api_helpers.c
@@ -70,28 +70,6 @@ cleanup_auditor (void *cls)
GNUNET_free (cc);
}
-
-
-/**
- * Function called with information about the auditor.
- *
- * @param cls closure
- * @param vi basic information about the auditor
- * @param compat protocol compatibility information
- */
-static void
-auditor_version_cb (void *cls,
- const struct TALER_AUDITOR_VersionInformation *vi,
- enum TALER_AUDITOR_VersionCompatibility compat)
-{
- struct TALER_TESTING_Interpreter *is = cls;
-
- /* TODO: check vi/compat? */
- is->auditor_working = GNUNET_YES;
-}
-
-
-
/**
* Closure for #auditor_main_wrapper()
*/
@@ -145,21 +123,13 @@ auditor_main_wrapper (void *cls,
"BASE_URL");
return;
}
- is->auditor = TALER_AUDITOR_connect (is->ctx,
- auditor_base_url,
- &auditor_version_cb,
- is);
+
GNUNET_free (auditor_base_url);
- if (NULL == is->auditor)
- {
- GNUNET_break (0);
- return;
- }
cc = GNUNET_new (struct CleanupContext);
cc->is = is;
cc->fcb = is->final_cleanup_cb;
cc->fcb_cls = is->final_cleanup_cb;
- is->final_cleanup_cb = &cleanup_auditor;
+ is->final_cleanup_cb = NULL;
is->final_cleanup_cb_cls = cc;
mwc->main_cb (mwc->main_cb_cls,
is);