Merge branch 'master' of taler.net:exchange
This commit is contained in:
commit
7177c5c015
@ -12,7 +12,8 @@ pkgcfg_DATA = \
|
||||
auditordb-postgres.conf
|
||||
|
||||
EXTRA_DIST = \
|
||||
auditordb-postgres.conf
|
||||
auditordb-postgres.conf \
|
||||
test-auditor-db-postgres.conf
|
||||
|
||||
plugindir = $(libdir)/taler
|
||||
|
||||
@ -49,5 +50,21 @@ libtalerauditordb_la_LDFLAGS = \
|
||||
-no-undefined
|
||||
|
||||
|
||||
EXTRA_test_auditordb_postgres_DEPENDENCIES = \
|
||||
libtaler_plugin_auditordb_postgres.la
|
||||
#EXTRA_test_auditordb_postgres_DEPENDENCIES = \
|
||||
# libtaler_plugin_auditordb_postgres.la
|
||||
|
||||
|
||||
check_PROGRAMS = \
|
||||
test-auditordb-postgres
|
||||
|
||||
AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH;
|
||||
TESTS = \
|
||||
test-auditordb-postgres
|
||||
|
||||
test_auditordb_postgres_SOURCES = \
|
||||
test_auditordb.c
|
||||
test_auditordb_postgres_LDADD = \
|
||||
libtalerauditordb.la \
|
||||
$(top_srcdir)/src/pq/libtalerpq.la \
|
||||
$(top_srcdir)/src/util/libtalerutil.la \
|
||||
-lgnunetutil
|
||||
|
File diff suppressed because it is too large
Load Diff
7
src/auditordb/test-auditor-db-postgres.conf
Normal file
7
src/auditordb/test-auditor-db-postgres.conf
Normal file
@ -0,0 +1,7 @@
|
||||
[auditor]
|
||||
# Which database backend do we use for the auditor?
|
||||
DB = postgres
|
||||
|
||||
[auditordb-postgres]
|
||||
# Argument for Postgres for how to connect to the database.
|
||||
DB_CONN_STR = "postgres:///talercheck"
|
253
src/auditordb/test_auditordb.c
Normal file
253
src/auditordb/test_auditordb.c
Normal file
@ -0,0 +1,253 @@
|
||||
/*
|
||||
This file is part of TALER
|
||||
Copyright (C) 2014, 2015, 2016 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
|
||||
Foundation; either version 3, or (at your option) any later version.
|
||||
|
||||
TALER is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
||||
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
|
||||
*/
|
||||
/**
|
||||
* @file auditordb/test_auditordb.c
|
||||
* @brief test cases for DB interaction functions
|
||||
* @author Sree Harsha Totakura
|
||||
* @author Christian Grothoff
|
||||
* @author Marcello Stanisci
|
||||
*/
|
||||
#include "platform.h"
|
||||
#include "taler_auditordb_lib.h"
|
||||
#include "taler_auditordb_plugin.h"
|
||||
|
||||
|
||||
/**
|
||||
* Global result from the testcase.
|
||||
*/
|
||||
static int result = -1;
|
||||
|
||||
/**
|
||||
* Report line of error if @a cond is true, and jump to label "drop".
|
||||
*/
|
||||
#define FAILIF(cond) \
|
||||
do { \
|
||||
if (!(cond)){ break;} \
|
||||
GNUNET_break (0); \
|
||||
/*goto drop;*/ \
|
||||
} while (0)
|
||||
|
||||
|
||||
/**
|
||||
* Initializes @a ptr with random data.
|
||||
*/
|
||||
#define RND_BLK(ptr) \
|
||||
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, ptr, sizeof (*ptr))
|
||||
|
||||
/**
|
||||
* Initializes @a ptr with zeros.
|
||||
*/
|
||||
#define ZR_BLK(ptr) \
|
||||
memset (ptr, 0, sizeof (*ptr))
|
||||
|
||||
|
||||
/**
|
||||
* Currency we use.
|
||||
*/
|
||||
#define CURRENCY "EUR"
|
||||
|
||||
/**
|
||||
* Database plugin under test.
|
||||
*/
|
||||
static struct TALER_AUDITORDB_Plugin *plugin;
|
||||
|
||||
|
||||
/**
|
||||
* Callback that should never be called.
|
||||
*/
|
||||
static void
|
||||
dead_prepare_cb (void *cls,
|
||||
unsigned long long rowid,
|
||||
const char *wire_method,
|
||||
const char *buf,
|
||||
size_t buf_size)
|
||||
{
|
||||
GNUNET_assert (0);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
select_denomination_info_result (void *cls,
|
||||
const struct TALER_DenominationKeyValidityPS *issue2)
|
||||
{
|
||||
const struct TALER_DenominationKeyValidityPS *issue1 = cls;
|
||||
|
||||
if (0 != memcmp (issue1, issue2, sizeof (*issue2)))
|
||||
{
|
||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
||||
"select_denomination_info_result: issue does not match\n");
|
||||
GNUNET_break (0);
|
||||
return GNUNET_SYSERR;
|
||||
}
|
||||
return GNUNET_OK;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Main function that will be run by the scheduler.
|
||||
*
|
||||
* @param cls closure with config
|
||||
*/
|
||||
static void
|
||||
run (void *cls)
|
||||
{
|
||||
struct GNUNET_CONFIGURATION_Handle *cfg = cls;
|
||||
struct TALER_AUDITORDB_Session *session;
|
||||
|
||||
if (NULL ==
|
||||
(plugin = TALER_AUDITORDB_plugin_load (cfg)))
|
||||
{
|
||||
result = 77;
|
||||
return;
|
||||
}
|
||||
|
||||
(void) plugin->drop_tables (plugin->cls);
|
||||
if (GNUNET_OK !=
|
||||
plugin->create_tables (plugin->cls))
|
||||
{
|
||||
result = 77;
|
||||
goto drop;
|
||||
}
|
||||
if (NULL ==
|
||||
(session = plugin->get_session (plugin->cls)))
|
||||
{
|
||||
result = 77;
|
||||
goto drop;
|
||||
}
|
||||
|
||||
struct TALER_Amount value, fee_withdraw, fee_deposit, fee_refresh, fee_refund;
|
||||
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":1.000010",
|
||||
&value));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":0.000011",
|
||||
&fee_withdraw));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":0.000012",
|
||||
&fee_deposit));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":0.000013",
|
||||
&fee_refresh));
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
TALER_string_to_amount (CURRENCY ":0.000014",
|
||||
&fee_refund));
|
||||
|
||||
struct TALER_MasterPublicKeyP master_pub;
|
||||
struct TALER_ReservePublicKeyP reserve_pub;
|
||||
RND_BLK (&master_pub);
|
||||
RND_BLK (&reserve_pub);
|
||||
|
||||
struct TALER_DenominationPrivateKey denom_priv;
|
||||
struct TALER_DenominationPublicKey denom_pub;
|
||||
struct GNUNET_HashCode denom_pub_hash;
|
||||
denom_priv.rsa_private_key = GNUNET_CRYPTO_rsa_private_key_create (1024);
|
||||
denom_pub.rsa_public_key = GNUNET_CRYPTO_rsa_private_key_get_public (denom_priv.rsa_private_key);
|
||||
GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, &denom_pub_hash);
|
||||
|
||||
struct GNUNET_TIME_Absolute now, past, future;
|
||||
now = GNUNET_TIME_absolute_get ();
|
||||
past = GNUNET_TIME_absolute_subtract (now,
|
||||
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS,
|
||||
4));
|
||||
future = GNUNET_TIME_absolute_add (now,
|
||||
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS,
|
||||
4));
|
||||
|
||||
struct TALER_DenominationKeyValidityPS issue = { 0 };
|
||||
issue.master = master_pub;
|
||||
issue.denom_hash = denom_pub_hash;
|
||||
|
||||
issue.start = GNUNET_TIME_absolute_hton (now);
|
||||
issue.expire_withdraw = GNUNET_TIME_absolute_hton
|
||||
(GNUNET_TIME_absolute_add (now,
|
||||
GNUNET_TIME_UNIT_HOURS));
|
||||
issue.expire_deposit = GNUNET_TIME_absolute_hton
|
||||
(GNUNET_TIME_absolute_add
|
||||
(now,
|
||||
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 2)));
|
||||
issue.expire_legal = GNUNET_TIME_absolute_hton
|
||||
(GNUNET_TIME_absolute_add
|
||||
(now,
|
||||
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 3)));
|
||||
TALER_amount_hton (&issue.value, &value);
|
||||
TALER_amount_hton (&issue.fee_withdraw, &fee_withdraw);
|
||||
TALER_amount_hton (&issue.fee_deposit, &fee_deposit);
|
||||
TALER_amount_hton (&issue.fee_refresh, &fee_refresh);
|
||||
TALER_amount_hton (&issue.fee_refund, &fee_refund);
|
||||
|
||||
FAILIF (GNUNET_OK !=
|
||||
plugin->insert_denomination_info (plugin->cls,
|
||||
session,
|
||||
&issue));
|
||||
|
||||
FAILIF (GNUNET_OK !=
|
||||
plugin->select_denomination_info (plugin->cls,
|
||||
session,
|
||||
&master_pub,
|
||||
select_denomination_info_result,
|
||||
&issue));
|
||||
|
||||
result = 0;
|
||||
|
||||
drop:
|
||||
|
||||
GNUNET_break (GNUNET_OK ==
|
||||
plugin->drop_tables (plugin->cls));
|
||||
TALER_AUDITORDB_plugin_unload (plugin);
|
||||
plugin = NULL;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main (int argc,
|
||||
char *const argv[])
|
||||
{
|
||||
const char *plugin_name;
|
||||
char *config_filename;
|
||||
char *testname;
|
||||
struct GNUNET_CONFIGURATION_Handle *cfg;
|
||||
|
||||
result = -1;
|
||||
if (NULL == (plugin_name = strrchr (argv[0], (int) '-')))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
return -1;
|
||||
}
|
||||
GNUNET_log_setup (argv[0],
|
||||
"WARNING",
|
||||
NULL);
|
||||
plugin_name++;
|
||||
(void) GNUNET_asprintf (&testname,
|
||||
"test-auditor-db-%s", plugin_name);
|
||||
(void) GNUNET_asprintf (&config_filename,
|
||||
"%s.conf", testname);
|
||||
cfg = GNUNET_CONFIGURATION_create ();
|
||||
if (GNUNET_OK !=
|
||||
GNUNET_CONFIGURATION_parse (cfg,
|
||||
config_filename))
|
||||
{
|
||||
GNUNET_break (0);
|
||||
GNUNET_free (config_filename);
|
||||
GNUNET_free (testname);
|
||||
return 2;
|
||||
}
|
||||
GNUNET_SCHEDULER_run (&run, cfg);
|
||||
GNUNET_CONFIGURATION_destroy (cfg);
|
||||
GNUNET_free (config_filename);
|
||||
GNUNET_free (testname);
|
||||
return result;
|
||||
}
|
@ -28,6 +28,90 @@
|
||||
#include "taler_signatures.h"
|
||||
|
||||
|
||||
/**
|
||||
* Function called with the results of select_denomination_info()
|
||||
*
|
||||
* @param cls closure
|
||||
* @param issue issuing information with value, fees and other info about the denomination.
|
||||
*
|
||||
* @return sets the return value of select_denomination_info(),
|
||||
* #GNUNET_OK to continue,
|
||||
* #GNUNET_NO to stop processing further rows
|
||||
* #GNUNET_SYSERR or other values on error.
|
||||
*/
|
||||
typedef int
|
||||
(*TALER_AUDITORDB_DenominationInfoDataCallback)(void *cls,
|
||||
const struct TALER_DenominationKeyValidityPS *issue);
|
||||
|
||||
|
||||
/**
|
||||
* Function called with the results of select_historic_denom_revenue()
|
||||
*
|
||||
* @param cls closure
|
||||
* @param denom_pub_hash hash of the denomination key
|
||||
* @param revenue_timestamp when did this profit get realized
|
||||
* @param revenue_balance what was the total profit made from
|
||||
* deposit fees, melting fees, refresh fees
|
||||
* and coins that were never returned?
|
||||
* @param deposit_fee_balance total profits from deposit fees
|
||||
* @param melt_fee_balance total profits from melting fees
|
||||
* @param refund_fee_balance total profits from refund fees
|
||||
*
|
||||
* @return sets the return value of select_denomination_info(),
|
||||
* #GNUNET_OK to continue,
|
||||
* #GNUNET_NO to stop processing further rows
|
||||
* #GNUNET_SYSERR or other values on error.
|
||||
*/
|
||||
typedef int
|
||||
(*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)(void *cls,
|
||||
const struct GNUNET_HashCode *denom_pub_hash,
|
||||
struct GNUNET_TIME_Absolute revenue_timestamp,
|
||||
const struct TALER_Amount *revenue_balance,
|
||||
const struct TALER_Amount *deposit_fee_balance,
|
||||
const struct TALER_Amount *melt_fee_balance,
|
||||
const struct TALER_Amount *refund_fee_balance);
|
||||
|
||||
|
||||
/**
|
||||
* Function called with the results of select_historic_losses()
|
||||
*
|
||||
* @param cls closure
|
||||
* @param denom_pub_hash hash of the denomination key
|
||||
* @param loss_timestamp when did this profit get realized
|
||||
* @param loss_balance what was the total loss
|
||||
*
|
||||
* @return sets the return value of select_denomination_info(),
|
||||
* #GNUNET_OK to continue,
|
||||
* #GNUNET_NO to stop processing further rows
|
||||
* #GNUNET_SYSERR or other values on error.
|
||||
*/
|
||||
typedef int
|
||||
(*TALER_AUDITORDB_HistoricLossesDataCallback)(void *cls,
|
||||
const struct GNUNET_HashCode *denom_pub_hash,
|
||||
struct GNUNET_TIME_Absolute loss_timestamp,
|
||||
const struct TALER_Amount *loss_balance);
|
||||
|
||||
|
||||
/**
|
||||
* Function called with the results of select_historic_reserve_revenue()
|
||||
*
|
||||
* @param cls closure
|
||||
* @param start_time beginning of aggregated time interval
|
||||
* @param end_time end of aggregated time interval
|
||||
* @param reserve_profits total profits made
|
||||
*
|
||||
* @return sets the return value of select_denomination_info(),
|
||||
* #GNUNET_OK to continue,
|
||||
* #GNUNET_NO to stop processing further rows
|
||||
* #GNUNET_SYSERR or other values on error.
|
||||
*/
|
||||
typedef int
|
||||
(*TALER_AUDITORDB_HistoricReserveRevenueDataCallback)(void *cls,
|
||||
struct GNUNET_TIME_Absolute start_time,
|
||||
struct GNUNET_TIME_Absolute end_time,
|
||||
const struct TALER_Amount *reserve_profits);
|
||||
|
||||
|
||||
/**
|
||||
* Handle for one session with the database.
|
||||
*/
|
||||
@ -164,7 +248,7 @@ struct TALER_AUDITORDB_Plugin
|
||||
(*select_denomination_info)(void *cls,
|
||||
struct TALER_AUDITORDB_Session *session,
|
||||
const struct TALER_MasterPublicKeyP *master_pub,
|
||||
void *cb, /* FIXME: type! */
|
||||
TALER_AUDITORDB_DenominationInfoDataCallback cb,
|
||||
void *cb_cls);
|
||||
|
||||
|
||||
@ -586,7 +670,7 @@ struct TALER_AUDITORDB_Plugin
|
||||
(*select_historic_denom_revenue)(void *cls,
|
||||
struct TALER_AUDITORDB_Session *session,
|
||||
const struct TALER_MasterPublicKeyP *master_pub,
|
||||
void *cb, /* FIXME: fix type */
|
||||
TALER_AUDITORDB_HistoricDenominationRevenueDataCallback cb,
|
||||
void *cb_cls);
|
||||
|
||||
|
||||
@ -628,7 +712,7 @@ struct TALER_AUDITORDB_Plugin
|
||||
(*select_historic_losses)(void *cls,
|
||||
struct TALER_AUDITORDB_Session *session,
|
||||
const struct TALER_MasterPublicKeyP *master_pub,
|
||||
void *cb, /* FIXME: fix type */
|
||||
TALER_AUDITORDB_HistoricLossesDataCallback cb,
|
||||
void *cb_cls);
|
||||
|
||||
|
||||
@ -666,7 +750,7 @@ struct TALER_AUDITORDB_Plugin
|
||||
(*select_historic_reserve_revenue)(void *cls,
|
||||
struct TALER_AUDITORDB_Session *session,
|
||||
const struct TALER_MasterPublicKeyP *master_pub,
|
||||
void *cb, /* FIXME: type */
|
||||
TALER_AUDITORDB_HistoricReserveRevenueDataCallback cb,
|
||||
void *cb_cls);
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user