Compare commits

..

No commits in common. "fea5bee835179c7b8eda54e272164abc3846e9b9" and "e7aeec04f4eb52caaa61b1ff9362f6fe0ffe0f2d" have entirely different histories.

4 changed files with 5 additions and 60 deletions

View File

@ -171,7 +171,6 @@ extension_update_event_cb (void *cls,
// Get the config from the database as string // Get the config from the database as string
{ {
char *config_str; char *config_str;
struct TALER_MasterSignatureP config_sig; // ignored
enum GNUNET_DB_QueryStatus qs; enum GNUNET_DB_QueryStatus qs;
struct TALER_Extension *extension; struct TALER_Extension *extension;
json_error_t err; json_error_t err;
@ -183,8 +182,7 @@ extension_update_event_cb (void *cls,
qs = TEH_plugin->get_extension_config (TEH_plugin->cls, qs = TEH_plugin->get_extension_config (TEH_plugin->cls,
extension->name, extension->name,
&config_str, &config_str);
&config_sig);
if (qs < 0) if (qs < 0)
{ {

View File

@ -2753,10 +2753,7 @@ prepare_statements (struct PostgresClosure *pg)
/* Used in #postgres_get_extension_config */ /* Used in #postgres_get_extension_config */
GNUNET_PQ_make_prepare ( GNUNET_PQ_make_prepare (
"get_extension_config", "get_extension_config",
"SELECT " "SELECT (config) FROM extensions"
" config, "
" config_sig "
"FROM extensions"
" WHERE name=$1;", " WHERE name=$1;",
1), 1),
GNUNET_PQ_PREPARED_STATEMENT_END GNUNET_PQ_PREPARED_STATEMENT_END
@ -11449,8 +11446,7 @@ postgres_set_extension_config (void *cls,
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
postgres_get_extension_config (void *cls, postgres_get_extension_config (void *cls,
const char *extension_name, const char *extension_name,
char **config, char **config)
struct TALER_MasterSignatureP *config_sig)
{ {
struct PostgresClosure *pg = cls; struct PostgresClosure *pg = cls;
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_QueryParam params[] = {
@ -11459,7 +11455,6 @@ postgres_get_extension_config (void *cls,
}; };
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_string ("config", config), GNUNET_PQ_result_spec_string ("config", config),
GNUNET_PQ_result_spec_auto_from_type ("config_sig", config_sig),
GNUNET_PQ_result_spec_end GNUNET_PQ_result_spec_end
}; };

View File

@ -108,49 +108,6 @@ mark_prepare_cb (void *cls,
} }
/**
* Simple check that config retrieval and setting for extensions work
*/
static enum GNUNET_GenericReturnValue
test_extension_config (void)
{
char *config;
struct TALER_MasterSignatureP sig;
memset (&sig, 0x42, sizeof(sig));
FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->get_extension_config (plugin->cls,
"fnord",
&config,
&sig));
sig.eddsa_signature.r[23] = 0x23;
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->set_extension_config (plugin->cls,
"fnord",
"bar",
&sig));
memset (&sig, 0, sizeof(sig));
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->get_extension_config (plugin->cls,
"fnord",
&config,
&sig));
FAILIF (0 != strcmp ("bar", config));
FAILIF (0x23 != sig.eddsa_signature.r[23]);
return GNUNET_OK;
drop:
return GNUNET_SYSERR;
}
/** /**
* Test API relating to persisting the wire plugins preparation data. * Test API relating to persisting the wire plugins preparation data.
* *
@ -1377,10 +1334,6 @@ run (void *cls)
0, 0,
&recoup_cb, &recoup_cb,
NULL)); NULL));
/* simple extension check */
FAILIF (GNUNET_OK !=
test_extension_config ());
RND_BLK (&reserve_pub); RND_BLK (&reserve_pub);
GNUNET_assert (GNUNET_OK == GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount (CURRENCY ":1.000010", TALER_string_to_amount (CURRENCY ":1.000010",

View File

@ -4049,8 +4049,7 @@ struct TALER_EXCHANGEDB_Plugin
enum GNUNET_DB_QueryStatus enum GNUNET_DB_QueryStatus
(*get_extension_config)(void *cls, (*get_extension_config)(void *cls,
const char *extension_name, const char *extension_name,
char **config, char **config);
struct TALER_MasterSignatureP *config_sig);
}; };