[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 129/277: fixed coding style in db tests and double call
From: |
gnunet |
Subject: |
[taler-merchant] 129/277: fixed coding style in db tests and double callbacks in lookup_instances |
Date: |
Sun, 05 Jul 2020 20:50:42 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit d46bd871bcd34b9e0d633ab15fd9a4747861616c
Author: Jonathan Buchanan <jonathan.russ.buchanan@gmail.com>
AuthorDate: Wed May 20 15:43:39 2020 -0400
fixed coding style in db tests and double callbacks in lookup_instances
---
src/backenddb/plugin_merchantdb_postgres.c | 4 +-
src/backenddb/test_merchantdb.c | 64 +++++++++++-------------------
2 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 670f1d0..874d33c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -472,9 +472,9 @@ lookup_instances_cb (void *cls,
params,
&lookup_accounts_cb,
lic);
- if (0 == lic->qs)
+ if (0 > lic->qs)
{
- /* find_accounts_cb() did not run, still notify about the
+ /* lookup_accounts_cb() did not run, still notify about the
account-less instance! */
call_with_accounts (lic,
0,
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index a3f23d4..30a0d88 100644
--- a/src/backenddb/test_merchantdb.c
+++ b/src/backenddb/test_merchantdb.c
@@ -42,46 +42,33 @@ static struct TALER_MERCHANTDB_Plugin *plugin;
static int instance_count;
void
-lookup_instances_callback (void *cls, const struct
- TALER_MerchantPublicKeyP *merchant_pub,
- const struct
- TALER_MerchantPrivateKeyP *merchant_priv, const
- struct
- TALER_MERCHANTDB_InstanceSettings *is,
- unsigned int accounts_length, const struct
- TALER_MERCHANTDB_AccountDetails accounts[])
+lookup_instances_cb (void *cls,
+ const struct TALER_MerchantPublicKeyP *merchant_pub,
+ const struct TALER_MerchantPrivateKeyP *merchant_priv,
+ const struct TALER_MERCHANTDB_InstanceSettings *is,
+ unsigned int accounts_length,
+ const struct TALER_MERCHANTDB_AccountDetails accounts[])
{
instance_count += 1;
}
int
-check_products_equal (struct TALER_MERCHANTDB_ProductDetails *a, struct
- TALER_MERCHANTDB_ProductDetails *b)
+check_products_equal (struct TALER_MERCHANTDB_ProductDetails *a,
+ struct TALER_MERCHANTDB_ProductDetails *b)
{
- if (strcmp (a->description, b->description) != 0)
- return 1;
- if (json_equal (a->description_i18n, b->description_i18n) != 1)
- return 1;
- if (strcmp (a->unit, b->unit) != 0)
- return 1;
- if (TALER_amount_cmp_currency (&a->price, &b->price) != 0)
- return 1;
- if (TALER_amount_cmp (&a->price, &b->price) != 0)
- return 1;
- if (json_equal (a->taxes, b->taxes) != 1)
- return 1;
- if (a->total_stock != b->total_stock)
- return 1;
- if (a->total_sold != b->total_sold)
- return 1;
- if (a->total_lost != b->total_lost)
- return 1;
- if (json_equal (a->image, b->image) != 1)
- return 1;
- if (json_equal (a->address, b->address) != 1)
- return 1;
- if (a->next_restock.abs_value_us != b->next_restock.abs_value_us)
+ if ((0 != strcmp (a->description, b->description)) ||
+ (1 != json_equal (a->description_i18n, b->description_i18n)) ||
+ (0 != strcmp (a->unit, b->unit)) ||
+ (0 != TALER_amount_cmp_currency (&a->price, &b->price)) ||
+ (0 != TALER_amount_cmp (&a->price, &b->price)) ||
+ (1 != json_equal (a->taxes, b->taxes)) ||
+ (a->total_stock != b->total_stock) ||
+ (a->total_sold != b->total_sold) ||
+ (a->total_lost != b->total_lost) ||
+ (1 != json_equal (a->image, b->image)) ||
+ (1 != json_equal (a->address, b->address)) ||
+ (a->next_restock.abs_value_us != b->next_restock.abs_value_us))
return 1;
return 0;
}
@@ -111,7 +98,7 @@ run (void *cls)
/* Test lookup instances- there should be nothing here */
instance_count = 0;
if (0 > plugin->lookup_instances (plugin->cls, false,
- lookup_instances_callback, cls))
+ lookup_instances_cb, cls))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Lookup instances failed\n");
@@ -146,7 +133,6 @@ run (void *cls)
is.default_wire_fee_amortization = 1;
is.default_wire_transfer_delay = GNUNET_TIME_relative_get_minute_ ();
is.default_pay_delay = GNUNET_TIME_relative_get_second_ ();
-
if (0 > plugin->insert_instance (plugin->cls, &merchant_pub, &merchant_priv,
&is))
{
@@ -160,7 +146,7 @@ run (void *cls)
/* Test lookup instances- is our new instance there? */
instance_count = 0;
if (0 > plugin->lookup_instances (plugin->cls, false,
- lookup_instances_callback, cls))
+ lookup_instances_cb, cls))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Lookup instances failed\n");
@@ -168,14 +154,13 @@ run (void *cls)
plugin->drop_tables (plugin->cls);
return;
}
- /* This test currently FAILS */
- /*if (instance_count != 1)
+ if (instance_count != 1)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Instance count doesn't match number of instances inserted\n");
result = 1;
return;
- }*/
+ }
/* Test update instance */
is.name = "Test - updated";
@@ -281,7 +266,6 @@ run (void *cls)
}
result = 0;
-
GNUNET_break (GNUNET_OK ==
plugin->drop_tables (plugin->cls));
TALER_MERCHANTDB_plugin_unload (plugin);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 106/277: implement merchant_api_post_transfers.c, (continued)
- [taler-merchant] 106/277: implement merchant_api_post_transfers.c, gnunet, 2020/07/05
- [taler-merchant] 111/277: fix link errors in test, gnunet, 2020/07/05
- [taler-merchant] 90/277: starting with get-orders-ID logic, gnunet, 2020/07/05
- [taler-merchant] 92/277: fix backenddb, gnunet, 2020/07/05
- [taler-merchant] 97/277: integrate POST /tranfers handler, gnunet, 2020/07/05
- [taler-merchant] 105/277: API design for /transfers, gnunet, 2020/07/05
- [taler-merchant] 113/277: use unregister, gnunet, 2020/07/05
- [taler-merchant] 112/277: rename _v to _mv for merchant, gnunet, 2020/07/05
- [taler-merchant] 118/277: implement POST /reserves, gnunet, 2020/07/05
- [taler-merchant] 122/277: fixed bool casts in plugin initialization, gnunet, 2020/07/05
- [taler-merchant] 129/277: fixed coding style in db tests and double callbacks in lookup_instances,
gnunet <=
- [taler-merchant] 131/277: towards POST tips pickup impl, gnunet, 2020/07/05
- [taler-merchant] 120/277: implement insert_reserve, gnunet, 2020/07/05
- [taler-merchant] 125/277: more work on GET /reserves logic, gnunet, 2020/07/05
- [taler-merchant] 99/277: more work on post /transfers and the like, gnunet, 2020/07/05
- [taler-merchant] 93/277: updates, gnunet, 2020/07/05
- [taler-merchant] 100/277: more work on POST /transfer, gnunet, 2020/07/05
- [taler-merchant] 121/277: Merge branch 'master' into protocolV1, gnunet, 2020/07/05
- [taler-merchant] 126/277: more instance and product related tests, gnunet, 2020/07/05
- [taler-merchant] 124/277: expanding DB API, gnunet, 2020/07/05
- [taler-merchant] 128/277: more work on tipping implementation, gnunet, 2020/07/05