taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert explicit AUDITOR_connect at tests.

Browse Source
This commit is contained in:
Marcello Stanisci 2019-01-25 15:57:27 +01:00
parent 222cac2762
commit 220ce20d05
No known key found for this signature in database
GPG Key ID: 8D526861953F4C0F
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/taler_testing_lib.h
View File

@ -369,6 +369,12 @@ struct TALER_TESTING_Interpreter
*/
int working;
/**
* Is the auditor running (#GNUNET_YES) or waiting
* for /version (#GNUNET_NO)?
*/
int auditor_working;
/**
* How often have we gotten a /keys response so far?
*/

7
src/lib/exchange_api_handle.c
View File

@ -645,9 +645,10 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
* @param compat protocol compatibility information
*/
static void
auditor_version_cb (void *cls,
const struct TALER_AUDITOR_VersionInformation *vi,
enum TALER_AUDITOR_VersionCompatibility compat)
auditor_version_cb
(void *cls,
const struct TALER_AUDITOR_VersionInformation *vi,
enum TALER_AUDITOR_VersionCompatibility compat)
{
struct TEAH_AuditorListEntry *ale = cls;

32
src/lib/testing_auditor_api_helpers.c
View File

@ -98,6 +98,25 @@ struct MainWrapperContext
};
/**
* 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;
}
/**
* Setup the @a is 'auditor' member before running the main test loop.
*
@ -124,12 +143,23 @@ auditor_main_wrapper (void *cls,
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 = NULL;
is->final_cleanup_cb = cleanup_auditor;
is->final_cleanup_cb_cls = cc;
mwc->main_cb (mwc->main_cb_cls,
is);