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

work on #5010

Browse Source
This commit is contained in:
Christian Grothoff 2017-06-15 22:10:12 +02:00
parent eb354680b4
commit 0e6c4ba898
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
9 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/auditordb/plugin_auditordb_postgres.c
View File

@ -1159,16 +1159,13 @@ postgres_gc (void *cls)
* @param cls the @e cls of this struct with the plugin-specific state
* @param session connection to use
* @param issue issuing information with value, fees and other info about the denomination
* @return #GNUNET_OK on success; #GNUNET_SYSERR on failure
* @return operation status result
*/
static int
static enum GNUNET_DB_QueryStatus
postgres_insert_denomination_info (void *cls,
struct TALER_AUDITORDB_Session *session,
const struct TALER_DenominationKeyValidityPS *issue)
{
PGresult *result;
int ret;
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_auto_from_type (&issue->denom_hash),
GNUNET_PQ_query_param_auto_from_type (&issue->master),
@ -1198,20 +1195,9 @@ postgres_insert_denomination_info (void *cls,
TALER_amount_cmp_currency_nbo (&issue->value,
&issue->fee_refund));
result = GNUNET_PQ_exec_prepared (session->conn,
"auditor_denominations_insert",
params);
if (PGRES_COMMAND_OK != PQresultStatus (result))
{
ret = GNUNET_SYSERR;
BREAK_DB_ERR (result);
}
else
{
ret = GNUNET_OK;
}
PQclear (result);
return ret;
return GNUNET_PQ_eval_prepared_non_select (session->conn,
"auditor_denominations_insert",
params);
}
@ -1237,6 +1223,7 @@ postgres_select_denomination_info (void *cls,
GNUNET_PQ_query_param_end
};
PGresult *result;
result = GNUNET_PQ_exec_prepared (session->conn,
"auditor_denominations_select",
params);

3
src/auditordb/test_auditordb.c
View File

@ -19,6 +19,7 @@
* @author Gabor X Toth
*/
#include "platform.h"
#include <gnunet/gnunet_db_lib.h>
#include "taler_auditordb_lib.h"
#include "taler_auditordb_plugin.h"
@ -193,7 +194,7 @@ run (void *cls)
TALER_amount_hton (&issue.fee_refresh, &fee_refresh);
TALER_amount_hton (&issue.fee_refund, &fee_refund);
FAILIF (GNUNET_OK !=
FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->insert_denomination_info (plugin->cls,
session,
&issue));

10
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -485,11 +485,11 @@ reload_keys_denom_iter (void *cls,
session);
break;
}
res = TEH_plugin->insert_denomination_info (TEH_plugin->cls,
session,
&dki->denom_pub,
&dki->issue);
if (GNUNET_OK != res)
qs = TEH_plugin->insert_denomination_info (TEH_plugin->cls,
session,
&dki->denom_pub,
&dki->issue);
if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT != qs)
{
/* Insert failed!? Very bad error, log and retry */
GNUNET_break (0);

2
src/exchange/test_taler_exchange_aggregator.c
View File

@ -1143,7 +1143,7 @@ run (void *cls)
if ( (GNUNET_OK !=
plugin->start (plugin->cls,
session)) ||
(GNUNET_OK !=
(GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->insert_denomination_info (plugin->cls,
session,
&dpk,

6
src/exchangedb/perf_taler_exchangedb_interpreter.c
View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
Copyright (C) 2014, 2015 GNUnet e.V.
Copyright (C) 2014-2017 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@ -1446,7 +1446,7 @@ interpret (struct PERF_TALER_EXCHANGEDB_interpreter_state *state)
case PERF_TALER_EXCHANGEDB_CMD_INSERT_DENOMINATION:
{
unsigned int denom_index;
int ret;
enum GNUNET_DB_QueryStatus ret;
struct TALER_EXCHANGEDB_DenominationKeyIssueInformation *dki ;
denom_index = state->cmd[state->i].details.insert_denomination.index_denom;
@ -1455,7 +1455,7 @@ interpret (struct PERF_TALER_EXCHANGEDB_interpreter_state *state)
state->session,
&dki->denom_pub,
&dki->issue);
GNUNET_assert (GNUNET_SYSERR != ret);
GNUNET_assert (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT == ret);
}
break;

10
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -1775,9 +1775,9 @@ execute_prepared_non_select (struct TALER_EXCHANGEDB_Session *session,
* @param session connection to use
* @param denom_pub the public key used for signing coins of this denomination
* @param issue issuing information with value, fees and other info about the coin
* @return #GNUNET_OK on success; #GNUNET_SYSERR on failure
* @return status of the query
*/
static int
static enum GNUNET_DB_QueryStatus
postgres_insert_denomination_info (void *cls,
struct TALER_EXCHANGEDB_Session *session,
const struct TALER_DenominationPublicKey *denom_pub,
@ -1814,9 +1814,9 @@ postgres_insert_denomination_info (void *cls,
TALER_amount_cmp_currency_nbo (&issue->properties.value,
&issue->properties.fee_refund));
return execute_prepared_non_select (session,
"denomination_insert",
params);
return GNUNET_PQ_eval_prepared_non_select (session->conn,
"denomination_insert",
params);
}

2
src/exchangedb/test_exchangedb.c
View File

@ -259,7 +259,7 @@ create_denom_key_pair (unsigned int size,
dki.issue.properties.purpose.size = htonl (sizeof (struct TALER_DenominationKeyValidityPS));
dki.issue.properties.purpose.purpose = htonl (TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY);
if (GNUNET_OK !=
if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->insert_denomination_info (plugin->cls,
session,
&dki.denom_pub,

4
src/include/taler_auditordb_plugin.h
View File

@ -275,9 +275,9 @@ struct TALER_AUDITORDB_Plugin
* @param cls the @e cls of this struct with the plugin-specific state
* @param session connection to use
* @param issue issuing information with value, fees and other info about the denomination
* @return #GNUNET_OK on success; #GNUNET_SYSERR on failure
* @return status of database operation
*/
int
enum GNUNET_DB_QueryStatus
(*insert_denomination_info)(void *cls,
struct TALER_AUDITORDB_Session *session,
const struct TALER_DenominationKeyValidityPS *issue);

4
src/include/taler_exchangedb_plugin.h
View File

@ -1135,9 +1135,9 @@ struct TALER_EXCHANGEDB_Plugin
* @param session connection to use
* @param denom_pub the public key used for signing coins of this denomination
* @param issue issuing information with value, fees and other info about the denomination
* @return #GNUNET_OK on success; #GNUNET_SYSERR on failure
* @return status of the query
*/
int
enum GNUNET_DB_QueryStatus
(*insert_denomination_info) (void *cls,
struct TALER_EXCHANGEDB_Session *session,
const struct TALER_DenominationPublicKey *denom_pub,