[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 05/05: more #5010-related work on backendd
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-merchant] 05/05: more #5010-related work on backenddb testcase |
|
Date: |
Tue, 27 Jun 2017 16:59:34 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 34a76ccd8f32639c0b50484f99d792a42a69c6cf
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jun 27 16:54:10 2017 +0200
more #5010-related work on backenddb testcase
---
src/backenddb/test_merchantdb.c | 68 ++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index 13d7862..03a0e07 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- (C) 2014, 2015, 2016 INRIA
+ (C) 2014-2017 INRIA
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the Free
Software
@@ -188,7 +188,6 @@ static json_t *contract_terms;
static json_t *contract_terms_future;
-
/**
* Function called with information about a transaction.
*
@@ -229,6 +228,7 @@ transaction_cb (void *cls,
&amount_with_fee));
}
+
/**
* Function called with information about a refund.
*
@@ -239,18 +239,20 @@ transaction_cb (void *cls,
* @param refund_amount refund amount which is being taken from coin_pub
* @param refund_fee cost of this refund operation
*/
-void
-refund_cb(void *cls,
- const struct TALER_CoinSpendPublicKeyP *coin_pub,
- uint64_t rtransaction_id,
- const char *reason,
- const struct TALER_Amount *refund_amount,
- const struct TALER_Amount *refund_fee)
+static void
+refund_cb (void *cls,
+ const struct TALER_CoinSpendPublicKeyP *coin_pub,
+ uint64_t rtransaction_id,
+ const char *reason,
+ const struct TALER_Amount *refund_amount,
+ const struct TALER_Amount *refund_fee)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "refund_cb\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "refund_cb\n");
/* FIXME, more logic here? */
}
+
/**
* Callback for `find_contract_terms_by_date`.
*
@@ -268,6 +270,7 @@ pd_cb (void *cls,
return;
}
+
/**
* Function called with information about a coin that was deposited.
*
@@ -452,7 +455,7 @@ run (void *cls)
TALER_JSON_hash (contract_terms,
&h_contract_terms);
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->insert_contract_terms (plugin->cls,
order_id,
&merchant_pub,
@@ -461,20 +464,20 @@ run (void *cls)
json_t *out;
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_contract_terms (plugin->cls,
&out,
order_id,
&merchant_pub));
- FAILIF (GNUNET_OK !=
- plugin->find_contract_terms_history (plugin->cls,
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+ plugin->find_contract_terms_history (plugin->cls,
order_id,
&merchant_pub,
&pd_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_contract_terms_from_hash (plugin->cls,
&out,
&h_contract_terms,
@@ -491,7 +494,7 @@ run (void *cls)
timestamp = GNUNET_TIME_absolute_get ();
GNUNET_TIME_round_abs (×tamp);
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->insert_contract_terms (plugin->cls,
order_id_future,
&merchant_pub,
@@ -518,7 +521,7 @@ run (void *cls)
&pd_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->store_transaction (plugin->cls,
&h_contract_terms,
&merchant_pub,
@@ -527,7 +530,7 @@ run (void *cls)
timestamp,
refund_deadline,
&amount_with_fee));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->store_deposit (plugin->cls,
&h_contract_terms,
&merchant_pub,
@@ -537,61 +540,61 @@ run (void *cls)
&refund_fee,
&signkey_pub,
deposit_proof));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->store_coin_to_transfer (plugin->cls,
&h_contract_terms,
&coin_pub,
&wtid));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->store_transfer_to_proof (plugin->cls,
EXCHANGE_URI,
&wtid,
GNUNET_TIME_UNIT_ZERO_ABS,
&signkey_pub,
transfer_proof));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_transaction (plugin->cls,
&h_contract_terms,
&merchant_pub,
&transaction_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_payments (plugin->cls,
&h_contract_terms,
&merchant_pub,
&deposit_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_transfers_by_hash (plugin->cls,
&h_contract_terms,
&transfer_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_deposits_by_wtid (plugin->cls,
&wtid,
&deposit_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->find_proof_by_wtid (plugin->cls,
EXCHANGE_URI,
&wtid,
&proof_cb,
NULL));
- FAILIF (GNUNET_NO !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->get_refunds_from_contract_terms_hash (plugin->cls,
&merchant_pub,
&h_contract_terms,
&refund_cb,
NULL));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->increase_refund_for_contract (plugin->cls,
&h_contract_terms,
&merchant_pub,
&refund_amount,
"refund testing"));
- FAILIF (GNUNET_NO !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->increase_refund_for_contract (plugin->cls,
&h_contract_terms,
&merchant_pub,
@@ -600,20 +603,20 @@ run (void *cls)
"the previous one, should
fail"));
/*Should fail as this refund a lesser amount respect to the previous one*/
- FAILIF (GNUNET_NO !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->increase_refund_for_contract (plugin->cls,
&h_contract_terms,
&merchant_pub,
&little_refund_amount,
"make refund testing fail"));
- FAILIF (GNUNET_OK !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
plugin->increase_refund_for_contract (plugin->cls,
&h_contract_terms,
&merchant_pub,
&right_second_refund_amount,
"right refund increase"));
- FAILIF (GNUNET_NO !=
+ FAILIF (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
plugin->increase_refund_for_contract (plugin->cls,
&h_contract_terms,
&merchant_pub,
@@ -625,7 +628,8 @@ run (void *cls)
result = 0;
drop:
- GNUNET_break (GNUNET_OK == plugin->drop_tables (plugin->cls));
+ GNUNET_break (GNUNET_OK ==
+ plugin->drop_tables (plugin->cls));
TALER_MERCHANTDB_plugin_unload (plugin);
plugin = NULL;
if (NULL != deposit_proof)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-merchant] branch master updated (90cf924 -> 34a76cc), gnunet, 2017/06/27
- [GNUnet-SVN] [taler-merchant] 03/05: fix logical order of functions, gnunet, 2017/06/27
- [GNUnet-SVN] [taler-merchant] 02/05: get rid of select *, remove fixme that is no longer needed, gnunet, 2017/06/27
- [GNUnet-SVN] [taler-merchant] 04/05: more #5010-related work on backenddb, gnunet, 2017/06/27
- [GNUnet-SVN] [taler-merchant] 01/05: remove dead macros, gnunet, 2017/06/27
- [GNUnet-SVN] [taler-merchant] 05/05: more #5010-related work on backenddb testcase,
gnunet <=