[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: towards fixing backend DB versio
|
From: |
gnunet |
|
Subject: |
[taler-merchant] branch master updated: towards fixing backend DB versioning, also fixing TALER_PQ_error_code() semantic change |
|
Date: |
Fri, 24 Jan 2020 17:17:34 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 112f7cf towards fixing backend DB versioning, also fixing
TALER_PQ_error_code() semantic change
112f7cf is described below
commit 112f7cfad738bcbdd880e9f1131a25135edf1381
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Jan 24 17:17:30 2020 +0100
towards fixing backend DB versioning, also fixing TALER_PQ_error_code()
semantic change
---
src/backend/merchant.conf | 4 -
src/backend/taler-merchant-httpd.c | 59 +++---
src/backend/taler-merchant-httpd.h | 5 -
src/backend/taler-merchant-httpd_track-transfer.c | 36 ++--
src/backenddb/Makefile.am | 6 +
src/backenddb/merchantdb-postgres.conf | 6 +
src/backenddb/merchantdb_plugin.c | 10 +-
src/backenddb/plugin_merchantdb_postgres.c | 208 ++++------------------
src/backenddb/test-merchantdb-postgres.conf | 4 +
src/backenddb/test_merchantdb.c | 5 +-
src/include/taler_merchantdb_lib.h | 4 +-
src/lib/merchant_api_pay.c | 25 ++-
src/lib/merchant_api_proposal.c | 18 +-
src/lib/merchant_api_refund.c | 5 +
src/lib/merchant_api_refund_increase.c | 5 +
src/lib/merchant_api_tip_authorize.c | 2 +-
src/lib/merchant_api_tip_query.c | 2 +-
src/merchant-tools/taler-merchant-dbinit.c | 10 +-
18 files changed, 165 insertions(+), 249 deletions(-)
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index fb82e64..4aac2da 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -54,10 +54,6 @@ WIRE_TRANSFER_DELAY = 3 week
# proposal be valid?
DEFAULT_PAY_DEADLINE = 1 day
-# Configuration for postgres database.
-[merchantdb-postgres]
-CONFIG = postgres:///talermerchant
-
[instance-default]
KEYFILE = ${TALER_DATA_HOME}/merchant/merchant.priv
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index ccdf566..7f2151e 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -161,6 +161,11 @@ struct GNUNET_CONTAINER_MultiHashMap *payment_trigger_map;
*/
struct GNUNET_SCHEDULER_Task *resume_timeout_task;
+/**
+ * Our configuration.
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
/**
* Return #GNUNET_YES if given a valid correlation ID and
@@ -642,12 +647,12 @@ locations_iterator_cb (void *cls,
"street_number",
NULL,
};
- struct GNUNET_CONFIGURATION_Handle *cfg = cls;
const char *prefix = "merchant-location-";
const char *substr = strstr (section, prefix);
const char *locname;
json_t *loc;
+ (void) cls;
if ( (NULL == substr) || (substr != section) )
return;
locname = section + strlen (prefix);
@@ -730,7 +735,7 @@ wireformat_iterator_cb (void *cls,
"HONOR_%s",
mi->id);
if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_yesno (iic->config,
+ GNUNET_CONFIGURATION_get_value_yesno (cfg,
section,
instance_option))
{
@@ -739,7 +744,7 @@ wireformat_iterator_cb (void *cls,
}
GNUNET_free (instance_option);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (iic->config,
+ GNUNET_CONFIGURATION_get_value_string (cfg,
section,
"PAYTO_URI",
&payto))
@@ -752,7 +757,7 @@ wireformat_iterator_cb (void *cls,
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (iic->config,
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
section,
"WIRE_RESPONSE",
&fn))
@@ -858,14 +863,16 @@ wireformat_iterator_cb (void *cls,
return;
}
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string
- (iic->config,
- section,
- "WIRE_FILE_MODE",
- &wire_file_mode))
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ section,
+ "WIRE_FILE_MODE",
+ &wire_file_mode))
{
errno = 0;
- mode_t mode = (mode_t) strtoul (wire_file_mode, NULL, 8);
+ mode_t mode = (mode_t) strtoul (wire_file_mode,
+ NULL,
+ 8);
if (0 != errno)
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
@@ -908,7 +915,7 @@ wireformat_iterator_cb (void *cls,
GNUNET_asprintf (&instance_option,
"ACTIVE_%s",
mi->id);
- wm->active = GNUNET_CONFIGURATION_get_value_yesno (iic->config,
+ wm->active = GNUNET_CONFIGURATION_get_value_yesno (cfg,
section,
instance_option);
GNUNET_free (instance_option);
@@ -956,7 +963,7 @@ instances_iterator_cb (void *cls,
token + 1);
mi = GNUNET_new (struct MerchantInstance);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (iic->config,
+ GNUNET_CONFIGURATION_get_value_string (cfg,
section,
"NAME",
&mi->name))
@@ -970,7 +977,7 @@ instances_iterator_cb (void *cls,
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (iic->config,
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
section,
"KEYFILE",
&mi->keyfile))
@@ -984,7 +991,7 @@ instances_iterator_cb (void *cls,
return;
}
if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (iic->config,
+ GNUNET_CONFIGURATION_get_value_string (cfg,
section,
"TIP_EXCHANGE",
&mi->tip_exchange))
@@ -993,7 +1000,7 @@ instances_iterator_cb (void *cls,
struct GNUNET_CRYPTO_EddsaPrivateKey *tip_pk;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (iic->config,
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
section,
"TIP_RESERVE_PRIV_FILENAME",
&tip_reserves))
@@ -1097,7 +1104,7 @@ instances_iterator_cb (void *cls,
.mi = mi
};
- GNUNET_CONFIGURATION_iterate_sections (iic->config,
+ GNUNET_CONFIGURATION_iterate_sections (cfg,
&wireformat_iterator_cb,
&wfic);
}
@@ -1144,17 +1151,16 @@ lookup_instance (const char *instance_id)
* Iterate over locations in config in order to populate
* the location data.
*
- * @param config configuration handle
* @return #GNUNET_OK if successful, #GNUNET_SYSERR upon errors
*/
static void
-iterate_locations (const struct GNUNET_CONFIGURATION_Handle *config)
+iterate_locations (void)
{
GNUNET_assert (NULL == default_locations);
default_locations = json_object ();
- GNUNET_CONFIGURATION_iterate_sections (config,
+ GNUNET_CONFIGURATION_iterate_sections (cfg,
&locations_iterator_cb,
- (void *) config);
+ NULL);
}
@@ -1162,19 +1168,17 @@ iterate_locations (const struct
GNUNET_CONFIGURATION_Handle *config)
* Iterate over each merchant instance, in order to populate
* each instance's own data
*
- * @param config configuration handle
* @return #GNUNET_OK if successful, #GNUNET_SYSERR upon errors
* (for example, if no "default" instance is defined)
*/
static int
-iterate_instances (const struct GNUNET_CONFIGURATION_Handle *config)
+iterate_instances (void)
{
struct IterateInstancesCls iic;
- iic.config = config;
iic.default_instance = GNUNET_NO;
iic.ret = GNUNET_OK;
- GNUNET_CONFIGURATION_iterate_sections (config,
+ GNUNET_CONFIGURATION_iterate_sections (cfg,
&instances_iterator_cb,
&iic);
@@ -1652,16 +1656,17 @@ run (void *cls,
return;
}
+ cfg = GNUNET_CONFIGURATION_dup (config);
if (GNUNET_OK !=
- iterate_instances (config))
+ iterate_instances ())
{
GNUNET_SCHEDULER_shutdown ();
return;
}
- iterate_locations (config);
+ iterate_locations ();
if (NULL ==
- (db = TALER_MERCHANTDB_plugin_load (config)))
+ (db = TALER_MERCHANTDB_plugin_load (cfg)))
{
GNUNET_SCHEDULER_shutdown ();
return;
diff --git a/src/backend/taler-merchant-httpd.h
b/src/backend/taler-merchant-httpd.h
index db01ea3..4695edd 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -42,11 +42,6 @@
struct IterateInstancesCls
{
- /**
- * Handle for the configuration beig parsed
- */
- const struct GNUNET_CONFIGURATION_Handle *config;
-
/**
* Current index in the global array of #MerchantInstance
* types. Used by the callback in order to know which index
diff --git a/src/backend/taler-merchant-httpd_track-transfer.c
b/src/backend/taler-merchant-httpd_track-transfer.c
index 86dc596..f9e9c60 100644
--- a/src/backend/taler-merchant-httpd_track-transfer.c
+++ b/src/backend/taler-merchant-httpd_track-transfer.c
@@ -470,24 +470,24 @@ check_transfer (void *cls,
/* Build the `TrackTransferConflictDetails` */
rctx->response
= TALER_MHD_make_json_pack (
- "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
- "code",
- (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
- "hint",
- "disagreement about deposit valuation",
- "exchange_deposit_proof", exchange_proof,
- "conflict_offset",
- (json_int_t) rctx->current_offset,
- "exchange_transfer_proof",
- rctx->original_response,
- "coin_pub", GNUNET_JSON_from_data_auto (
- coin_pub),
- "h_contract_terms",
- GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
- "amount_with_fee", TALER_JSON_from_amount (
- amount_with_fee),
- "deposit_fee", TALER_JSON_from_amount (
- deposit_fee));
+ "{s:I, s:s, s:o, s:I, s:o, s:o, s:s, s:o, s:o}",
+ "code",
+ (json_int_t) TALER_EC_TRACK_TRANSFER_CONFLICTING_REPORTS,
+ "hint",
+ "disagreement about deposit valuation",
+ "exchange_deposit_proof", exchange_proof,
+ "conflict_offset",
+ (json_int_t) rctx->current_offset,
+ "exchange_transfer_proof",
+ rctx->original_response,
+ "coin_pub", GNUNET_JSON_from_data_auto (
+ coin_pub),
+ "h_contract_terms",
+ GNUNET_JSON_from_data_auto (&ttd->h_contract_terms),
+ "amount_with_fee", TALER_JSON_from_amount (
+ amount_with_fee),
+ "deposit_fee", TALER_JSON_from_amount (
+ deposit_fee));
return;
}
rctx->check_transfer_result = GNUNET_OK;
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index eb5e0ae..8f0479d 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -3,6 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
plugindir = $(libdir)/taler
+pkgcfgdir = $(prefix)/share/taler/config.d/
+
+pkgcfg_DATA = \
+ merchantdb-postgres.conf
+
sqldir = $(prefix)/share/taler/sql/merchant/
sql_DATA = \
@@ -76,4 +81,5 @@ TESTS = \
EXTRA_DIST = \
test-merchantdb-postgres.conf \
+ merchantdb-postgres.conf \
$(sql_DATA)
diff --git a/src/backenddb/merchantdb-postgres.conf
b/src/backenddb/merchantdb-postgres.conf
new file mode 100644
index 0000000..db4763b
--- /dev/null
+++ b/src/backenddb/merchantdb-postgres.conf
@@ -0,0 +1,6 @@
+[merchantdb-postgres]
+CONFIG = "postgres:///talermerchant"
+
+# Where are the SQL files to setup our tables?
+# Important: this MUST end with a "/"!
+SQL_DIR = $DATADIR/sql/merchant/
diff --git a/src/backenddb/merchantdb_plugin.c
b/src/backenddb/merchantdb_plugin.c
index 5d82243..473c659 100644
--- a/src/backenddb/merchantdb_plugin.c
+++ b/src/backenddb/merchantdb_plugin.c
@@ -28,15 +28,14 @@
/**
* Initialize the plugin.
*
- * @param cfg configuration to use
+ * @param[in,out] cfg configuration to use
* @return #GNUNET_OK on success
*/
struct TALER_MERCHANTDB_Plugin *
-TALER_MERCHANTDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg)
+TALER_MERCHANTDB_plugin_load (struct GNUNET_CONFIGURATION_Handle *cfg)
{
char *plugin_name;
char *lib_name;
- struct GNUNET_CONFIGURATION_Handle *cfg_dup;
struct TALER_MERCHANTDB_Plugin *plugin;
if (GNUNET_SYSERR ==
@@ -54,13 +53,12 @@ TALER_MERCHANTDB_plugin_load (const struct
GNUNET_CONFIGURATION_Handle *cfg)
"libtaler_plugin_merchantdb_%s",
plugin_name);
GNUNET_free (plugin_name);
- cfg_dup = GNUNET_CONFIGURATION_dup (cfg);
- plugin = GNUNET_PLUGIN_load (lib_name, cfg_dup);
+ plugin = GNUNET_PLUGIN_load (lib_name,
+ cfg);
if (NULL != plugin)
plugin->library_name = lib_name;
else
GNUNET_free (lib_name);
- GNUNET_CONFIGURATION_destroy (cfg_dup);
return plugin;
}
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index 0a3ccc9..55c2fc1 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -84,6 +84,11 @@ struct PostgresClosure
*/
char *currency;
+ /**
+ * Directory with SQL statements to run to create tables.
+ */
+ char *sql_dir;
+
/**
* Underlying configuration.
*/
@@ -107,37 +112,16 @@ static int
postgres_drop_tables (void *cls)
{
struct PostgresClosure *pg = cls;
- struct GNUNET_PQ_ExecuteStatement es[] = {
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_transfers CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_deposits CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_transactions CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_proofs CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_contract_terms CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_refunds CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS exchange_wire_fees CASCADE;"),
- GNUNET_PQ_make_try_execute ("DROP TABLE IF EXISTS merchant_tips CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_tip_pickups CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_tip_reserve_credits CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_tip_reserves CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_orders CASCADE;"),
- GNUNET_PQ_make_try_execute (
- "DROP TABLE IF EXISTS merchant_session_info CASCADE;"),
- GNUNET_PQ_EXECUTE_STATEMENT_END
- };
-
- return GNUNET_PQ_exec_statements (pg->conn,
- es);
+ char *load_path;
+
+ GNUNET_asprintf (&load_path,
+ "%s%s",
+ pg->sql_dir,
+ "drop");
+ GNUNET_PQ_run_sql (pg->conn,
+ load_path);
+ GNUNET_free (load_path);
+ return GNUNET_OK;
}
@@ -3057,147 +3041,6 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
struct PostgresClosure *pg;
struct TALER_MERCHANTDB_Plugin *plugin;
const char *ec;
- struct GNUNET_PQ_ExecuteStatement es[] = {
- /* Orders created by the frontend, not signed or given a nonce yet.
- The contract terms will change (nonce will be added) when moved to the
- contract terms table */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_orders ("
- "order_id VARCHAR NOT NULL"
- ",merchant_pub BYTEA NOT NULL CHECK
(LENGTH(merchant_pub)=32)"
- ",contract_terms BYTEA NOT NULL"
- ",timestamp INT8 NOT NULL"
- ",PRIMARY KEY (order_id, merchant_pub)"
- ");"),
- /* Offers we made to customers */
- GNUNET_PQ_make_execute (
- "CREATE TABLE IF NOT EXISTS merchant_contract_terms ("
- "order_id VARCHAR NOT NULL"
- ",merchant_pub BYTEA NOT NULL CHECK (LENGTH(merchant_pub)=32)"
- ",contract_terms BYTEA NOT NULL"
- ",h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64)"
- ",timestamp INT8 NOT NULL"
- ",row_id BIGSERIAL UNIQUE"
- ",paid boolean DEFAULT FALSE NOT NULL"
- ",PRIMARY KEY (order_id, merchant_pub)"
- ",UNIQUE (h_contract_terms, merchant_pub)"
- ");"),
- /* Table with the proofs for each coin we deposited at the exchange */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_deposits ("
- " h_contract_terms BYTEA NOT NULL"
- ",merchant_pub BYTEA NOT NULL CHECK
(LENGTH(merchant_pub)=32)"
- ",coin_pub BYTEA NOT NULL CHECK
(LENGTH(coin_pub)=32)"
- ",exchange_url VARCHAR NOT NULL"
- ",amount_with_fee_val INT8 NOT NULL"
- ",amount_with_fee_frac INT4 NOT NULL"
- ",deposit_fee_val INT8 NOT NULL"
- ",deposit_fee_frac INT4 NOT NULL"
- ",refund_fee_val INT8 NOT NULL"
- ",refund_fee_frac INT4 NOT NULL"
- ",wire_fee_val INT8 NOT NULL"
- ",wire_fee_frac INT4 NOT NULL"
- ",signkey_pub BYTEA NOT NULL CHECK
(LENGTH(signkey_pub)=32)"
- ",exchange_proof BYTEA NOT NULL"
- ",PRIMARY KEY (h_contract_terms, coin_pub)"
- ",FOREIGN KEY (h_contract_terms, merchant_pub)
REFERENCES merchant_contract_terms (h_contract_terms, merchant_pub)"
- ");"),
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_proofs ("
- " exchange_url VARCHAR NOT NULL"
- ",wtid BYTEA CHECK (LENGTH(wtid)=32)"
- ",execution_time INT8 NOT NULL"
- ",signkey_pub BYTEA NOT NULL CHECK
(LENGTH(signkey_pub)=32)"
- ",proof BYTEA NOT NULL"
- ",PRIMARY KEY (wtid, exchange_url)"
- ");"),
- /* Note that h_contract_terms + coin_pub may actually be unknown to
- us, e.g. someone else deposits something for us at the exchange.
- Hence those cannot be foreign keys into deposits/transactions! */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_transfers ("
- " h_contract_terms BYTEA NOT NULL"
- ",coin_pub BYTEA NOT NULL CHECK
(LENGTH(coin_pub)=32)"
- ",wtid BYTEA NOT NULL CHECK (LENGTH(wtid)=32)"
- ",PRIMARY KEY (h_contract_terms, coin_pub)"
- ");"),
- GNUNET_PQ_make_try_execute (
- "CREATE INDEX IF NOT EXISTS merchant_transfers_by_coin"
- " ON merchant_transfers (h_contract_terms, coin_pub)"),
- GNUNET_PQ_make_try_execute (
- "CREATE INDEX IF NOT EXISTS merchant_transfers_by_wtid"
- " ON merchant_transfers (wtid)"),
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS exchange_wire_fees ("
- " exchange_pub BYTEA NOT NULL CHECK
(length(exchange_pub)=32)"
- ",h_wire_method BYTEA NOT NULL CHECK
(length(h_wire_method)=64)"
- ",wire_fee_val INT8 NOT NULL"
- ",wire_fee_frac INT4 NOT NULL"
- ",closing_fee_val INT8 NOT NULL"
- ",closing_fee_frac INT4 NOT NULL"
- ",start_date INT8 NOT NULL"
- ",end_date INT8 NOT NULL"
- ",exchange_sig BYTEA NOT NULL CHECK
(length(exchange_sig)=64)"
- ",PRIMARY KEY
(exchange_pub,h_wire_method,start_date,end_date)"
- ");"),
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_refunds ("
- " rtransaction_id BIGSERIAL UNIQUE"
- ",merchant_pub BYTEA NOT NULL CHECK
(LENGTH(merchant_pub)=32)"
- ",h_contract_terms BYTEA NOT NULL"
- ",coin_pub BYTEA NOT NULL CHECK
(LENGTH(coin_pub)=32)"
- ",reason VARCHAR NOT NULL"
- ",refund_amount_val INT8 NOT NULL"
- ",refund_amount_frac INT4 NOT NULL"
- ",refund_fee_val INT8 NOT NULL"
- ",refund_fee_frac INT4 NOT NULL"
- ");"),
- /* balances of the reserves available for tips */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_tip_reserves
("
- " reserve_priv BYTEA NOT NULL CHECK
(LENGTH(reserve_priv)=32)"
- ",expiration INT8 NOT NULL"
- ",balance_val INT8 NOT NULL"
- ",balance_frac INT4 NOT NULL"
- ",PRIMARY KEY (reserve_priv)"
- ");"),
- /* table where we remember when tipping reserves where established /
enabled */
- GNUNET_PQ_make_execute (
- "CREATE TABLE IF NOT EXISTS merchant_tip_reserve_credits ("
- " reserve_priv BYTEA NOT NULL CHECK (LENGTH(reserve_priv)=32)"
- ",credit_uuid BYTEA UNIQUE NOT NULL CHECK (LENGTH(credit_uuid)=64)"
- ",timestamp INT8 NOT NULL"
- ",amount_val INT8 NOT NULL"
- ",amount_frac INT4 NOT NULL"
- ",PRIMARY KEY (credit_uuid)"
- ");"),
- /* tips that have been authorized */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_tips ("
- " reserve_priv BYTEA NOT NULL CHECK
(LENGTH(reserve_priv)=32)"
- ",tip_id BYTEA NOT NULL CHECK (LENGTH(tip_id)=64)"
- ",exchange_url VARCHAR NOT NULL"
- ",justification VARCHAR NOT NULL"
- ",extra BYTEA NOT NULL"
- ",timestamp INT8 NOT NULL"
- ",amount_val INT8 NOT NULL" /* overall tip amount
*/
- ",amount_frac INT4 NOT NULL"
- ",left_val INT8 NOT NULL" /* tip amount not yet
picked up */
- ",left_frac INT4 NOT NULL"
- ",PRIMARY KEY (tip_id)"
- ");"),
- /* tips that have been picked up */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_tip_pickups ("
- " tip_id BYTEA NOT NULL REFERENCES merchant_tips
(tip_id) ON DELETE CASCADE"
- ",pickup_id BYTEA NOT NULL CHECK
(LENGTH(pickup_id)=64)"
- ",amount_val INT8 NOT NULL"
- ",amount_frac INT4 NOT NULL"
- ",PRIMARY KEY (pickup_id)"
- ");"),
- /* sessions and their order_id/fulfillment_url mapping */
- GNUNET_PQ_make_execute ("CREATE TABLE IF NOT EXISTS merchant_session_info
("
- " session_id VARCHAR NOT NULL"
- ",fulfillment_url VARCHAR NOT NULL"
- ",order_id VARCHAR NOT NULL"
- ",merchant_pub BYTEA NOT NULL CHECK
(LENGTH(merchant_pub)=32)"
- ",timestamp INT8 NOT NULL"
- ",PRIMARY KEY (session_id, fulfillment_url,
merchant_pub)"
- ",UNIQUE (session_id, fulfillment_url, order_id,
merchant_pub)"
- ");"),
- GNUNET_PQ_EXECUTE_STATEMENT_END
- };
struct GNUNET_PQ_PreparedStatement ps[] = {
GNUNET_PQ_make_prepare ("insert_deposit",
"INSERT INTO merchant_deposits"
@@ -3635,6 +3478,19 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
};
pg = GNUNET_new (struct PostgresClosure);
+ pg->cfg = cfg;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "merchantdb-postgres",
+ "SQL_DIR",
+ &pg->sql_dir))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ "merchantdb-postgres",
+ "SQL_DIR");
+ GNUNET_free (pg);
+ return NULL;
+ }
ec = getenv ("TALER_MERCHANTDB_POSTGRES_CONFIG");
if (NULL != ec)
{
@@ -3653,16 +3509,19 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"merchantdb-postgres",
"CONFIG");
+ GNUNET_free (pg->sql_dir);
+ GNUNET_free (pg);
return NULL;
}
}
- pg->cfg = cfg;
pg->conn = GNUNET_PQ_connect_with_cfg (cfg,
"merchantdb-postgres",
- es,
+ "",
+ NULL,
ps);
if (NULL == pg->conn)
{
+ GNUNET_free (pg->sql_dir);
GNUNET_free (pg);
return NULL;
}
@@ -3676,6 +3535,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
"taler",
"CURRENCY");
GNUNET_PQ_disconnect (pg->conn);
+ GNUNET_free (pg->sql_dir);
GNUNET_free (pg);
return NULL;
}
diff --git a/src/backenddb/test-merchantdb-postgres.conf
b/src/backenddb/test-merchantdb-postgres.conf
index eccf421..03bbc35 100644
--- a/src/backenddb/test-merchantdb-postgres.conf
+++ b/src/backenddb/test-merchantdb-postgres.conf
@@ -4,5 +4,9 @@ DB = postgres
[merchantdb-postgres]
CONFIG = postgres:///talercheck
+# Where are the SQL files to setup our tables?
+# Important: this MUST end with a "/"!
+SQL_DIR = $DATADIR/sql/merchant/
+
[taler]
CURRENCY = "EUR"
\ No newline at end of file
diff --git a/src/backenddb/test_merchantdb.c b/src/backenddb/test_merchantdb.c
index 99f6434..f7baf1e 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-2017 INRIA
+ (C) 2014-2017 Taler Systems SA
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
@@ -1065,7 +1065,8 @@ main (int argc,
GNUNET_free (testname);
return 2;
}
- GNUNET_SCHEDULER_run (&run, cfg);
+ GNUNET_SCHEDULER_run (&run,
+ cfg);
GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (config_filename);
GNUNET_free (testname);
diff --git a/src/include/taler_merchantdb_lib.h
b/src/include/taler_merchantdb_lib.h
index ad8d269..eba702b 100644
--- a/src/include/taler_merchantdb_lib.h
+++ b/src/include/taler_merchantdb_lib.h
@@ -33,11 +33,11 @@ struct TALER_MERCHANTDB_Plugin;
/**
* Connect to postgresql database
*
- * @param cfg the configuration handle
+ * @param[in,out] cfg the configuration handle
* @return connection to the database; NULL upon error
*/
struct TALER_MERCHANTDB_Plugin *
-TALER_MERCHANTDB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg);
+TALER_MERCHANTDB_plugin_load (struct GNUNET_CONFIGURATION_Handle *cfg);
/**
diff --git a/src/lib/merchant_api_pay.c b/src/lib/merchant_api_pay.c
index 2637199..3af1ab9 100644
--- a/src/lib/merchant_api_pay.c
+++ b/src/lib/merchant_api_pay.c
@@ -338,6 +338,7 @@ handle_pay_finished (void *cls,
{
struct TALER_MERCHANT_Pay *ph = cls;
const json_t *json = response;
+ enum TALER_ErrorCode ec;
ph->job = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -349,19 +350,25 @@ handle_pay_finished (void *cls,
switch (response_code)
{
case 0:
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_OK:
+ ec = TALER_EC_NONE;
+ break;
/* Tolerating Not Acceptable because sometimes
* - especially in tests - we might want to POST
* coins one at a time. */
case MHD_HTTP_NOT_ACCEPTABLE:
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_BAD_REQUEST:
+ ec = TALER_JSON_get_error_code (json);
/* This should never happen, either us
* or the merchant is buggy (or API version conflict);
* just pass JSON reply to the application */
break;
case MHD_HTTP_CONFLICT:
+ ec = TALER_JSON_get_error_code (json);
if (GNUNET_OK != check_conflict (ph,
json))
{
@@ -370,25 +377,30 @@ handle_pay_finished (void *cls,
}
break;
case MHD_HTTP_FORBIDDEN:
+ ec = TALER_JSON_get_error_code (json);
/* Nothing really to verify, merchant says one of the
* signatures is invalid; as we checked them, this
* should never happen, we should pass the JSON reply
* to the application */
break;
case MHD_HTTP_NOT_FOUND:
+ ec = TALER_JSON_get_error_code (json);
/* Nothing really to verify, this should never
happen, we should pass the JSON reply to the
application */
break;
case MHD_HTTP_INTERNAL_SERVER_ERROR:
+ ec = TALER_JSON_get_error_code (json);
/* Server had an internal issue; we should retry,
but this API leaves this to the application */
break;
case MHD_HTTP_SERVICE_UNAVAILABLE:
+ ec = TALER_JSON_get_error_code (json);
/* Exchange couldn't respond properly; the retry is
left to the application */
break;
default:
+ ec = TALER_JSON_get_error_code (json);
/* unexpected response code */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Unexpected response code %u\n",
@@ -399,7 +411,7 @@ handle_pay_finished (void *cls,
}
ph->pay_cb (ph->pay_cb_cls,
response_code,
- TALER_JSON_get_error_code (json),
+ ec,
json);
}
else
@@ -410,6 +422,7 @@ handle_pay_finished (void *cls,
switch (response_code)
{
case 0:
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_OK:
if (GNUNET_OK ==
@@ -420,30 +433,37 @@ handle_pay_finished (void *cls,
return;
}
response_code = 0;
+ ec = TALER_EC_NONE;
break;
case MHD_HTTP_BAD_REQUEST:
+ ec = TALER_JSON_get_error_code (json);
/* This should never happen, either us or the
merchant is buggy (or API version conflict); just
pass JSON reply to the application */
break;
case MHD_HTTP_CONFLICT:
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_FORBIDDEN:
+ ec = TALER_JSON_get_error_code (json);
/* Nothing really to verify, merchant says one of
the signatures is invalid; as we checked them,
this should never happen, we should pass the JSON
reply to the application */
break;
case MHD_HTTP_NOT_FOUND:
+ ec = TALER_JSON_get_error_code (json);
/* Nothing really to verify, this should never
happen, we should pass the JSON reply to the
application */
break;
case MHD_HTTP_INTERNAL_SERVER_ERROR:
+ ec = TALER_JSON_get_error_code (json);
/* Server had an internal issue; we should retry,
but this API leaves this to the application */
break;
default:
+ ec = TALER_JSON_get_error_code (json);
/* unexpected response code */
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Unexpected response code %u\n",
@@ -454,14 +474,13 @@ handle_pay_finished (void *cls,
}
ph->abort_cb (ph->abort_cb_cls,
response_code,
- TALER_JSON_get_error_code (json),
+ ec,
NULL,
NULL,
0,
NULL,
json);
}
-
TALER_MERCHANT_pay_cancel (ph);
}
diff --git a/src/lib/merchant_api_proposal.c b/src/lib/merchant_api_proposal.c
index 0909c1d..650de18 100644
--- a/src/lib/merchant_api_proposal.c
+++ b/src/lib/merchant_api_proposal.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014-2017 GNUnet e.V. and INRIA
+ Copyright (C) 2014-2020 Taler Systems SA
TALER is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
@@ -131,7 +131,7 @@ handle_proposal_finished (void *cls,
struct TALER_MERCHANT_ProposalOperation *po = cls;
const char *order_id;
const json_t *json = response;
-
+ enum TALER_ErrorCode ec;
struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("order_id",
&order_id),
@@ -158,30 +158,40 @@ handle_proposal_finished (void *cls,
{
GNUNET_break_op (0);
response_code = 0;
+ ec = TALER_JSON_get_error_code (json);
break;
}
+ else
+ {
+ ec = TALER_EC_NONE;
+ }
}
break;
case MHD_HTTP_BAD_REQUEST:
+ ec = TALER_JSON_get_error_code (json);
/* This should never happen, either us or
the merchant is buggy (or API version conflict);
just pass JSON reply to the application */
break;
case MHD_HTTP_CONFLICT:
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_FORBIDDEN:
/* Nothing really to verify, merchant says one
of the signatures is invalid; as we checked them,
this should never happen, we should pass the JSON
reply to the application */
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_NOT_FOUND:
/* Nothing really to verify, this should never
happen, we should pass the JSON reply to the application */
+ ec = TALER_JSON_get_error_code (json);
break;
case MHD_HTTP_INTERNAL_SERVER_ERROR:
/* Server had an internal issue; we should retry,
but this API leaves this to the application */
+ ec = TALER_JSON_get_error_code (json);
break;
default:
/* unexpected response code */
@@ -190,10 +200,12 @@ handle_proposal_finished (void *cls,
(unsigned int) response_code);
GNUNET_break (0);
response_code = 0;
+ ec = TALER_JSON_get_error_code (json);
+ break;
}
po->cb (po->cb_cls,
response_code,
- TALER_JSON_get_error_code (json),
+ ec,
json,
order_id);
GNUNET_JSON_parse_free (spec);
diff --git a/src/lib/merchant_api_refund.c b/src/lib/merchant_api_refund.c
index 9d8187f..9cf4d5f 100644
--- a/src/lib/merchant_api_refund.c
+++ b/src/lib/merchant_api_refund.c
@@ -108,6 +108,11 @@ handle_refund_lookup_finished (void *cls,
NULL);
break;
case MHD_HTTP_OK:
+ rlo->cb (rlo->cb_cls,
+ response_code,
+ TALER_EC_NONE,
+ json);
+ break;
case MHD_HTTP_NOT_FOUND:
rlo->cb (rlo->cb_cls,
response_code,
diff --git a/src/lib/merchant_api_refund_increase.c
b/src/lib/merchant_api_refund_increase.c
index 7464502..3adb988 100644
--- a/src/lib/merchant_api_refund_increase.c
+++ b/src/lib/merchant_api_refund_increase.c
@@ -91,6 +91,11 @@ handle_refund_increase_finished (void *cls,
NULL);
break;
case MHD_HTTP_OK:
+ rio->cb (rio->cb_cls,
+ response_code,
+ TALER_EC_NONE,
+ json);
+ break;
case MHD_HTTP_CONFLICT:
case MHD_HTTP_NOT_FOUND:
rio->cb (rio->cb_cls,
diff --git a/src/lib/merchant_api_tip_authorize.c
b/src/lib/merchant_api_tip_authorize.c
index 7ed4f5a..b921831 100644
--- a/src/lib/merchant_api_tip_authorize.c
+++ b/src/lib/merchant_api_tip_authorize.c
@@ -106,7 +106,7 @@ check_ok (struct TALER_MERCHANT_TipAuthorizeOperation *tao,
}
tao->cb (tao->cb_cls,
MHD_HTTP_OK,
- TALER_JSON_get_error_code (json),
+ TALER_EC_NONE,
taler_tip_uri,
&tip_id);
tao->cb = NULL; /* do not call twice */
diff --git a/src/lib/merchant_api_tip_query.c b/src/lib/merchant_api_tip_query.c
index d2a98a9..65aece6 100644
--- a/src/lib/merchant_api_tip_query.c
+++ b/src/lib/merchant_api_tip_query.c
@@ -109,7 +109,7 @@ check_ok (struct TALER_MERCHANT_TipQueryOperation *tqo,
}
tqo->cb (tqo->cb_cls,
MHD_HTTP_OK,
- TALER_JSON_get_error_code (json),
+ TALER_EC_NONE,
json,
reserve_expiration,
&reserve_pub,
diff --git a/src/merchant-tools/taler-merchant-dbinit.c
b/src/merchant-tools/taler-merchant-dbinit.c
index b5e85ee..d5f2da6 100644
--- a/src/merchant-tools/taler-merchant-dbinit.c
+++ b/src/merchant-tools/taler-merchant-dbinit.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014, 2015 GNUnet e.V.
+ Copyright (C) 2014, 2015 Taler Systems SA
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
@@ -41,22 +41,25 @@ static int reset_db;
* @param cls closure
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be
NULL!)
- * @param cfg configuration
+ * @param config configuration
*/
static void
run (void *cls,
char *const *args,
const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+ const struct GNUNET_CONFIGURATION_Handle *config)
{
struct TALER_MERCHANTDB_Plugin *plugin;
+ struct GNUNET_CONFIGURATION_Handle *cfg;
+ cfg = GNUNET_CONFIGURATION_dup (config);
if (NULL ==
(plugin = TALER_MERCHANTDB_plugin_load (cfg)))
{
fprintf (stderr,
"Failed to initialize database plugin.\n");
global_ret = 1;
+ GNUNET_CONFIGURATION_destroy (cfg);
return;
}
if (reset_db)
@@ -66,6 +69,7 @@ run (void *cls,
plugin = TALER_MERCHANTDB_plugin_load (cfg);
}
TALER_MERCHANTDB_plugin_unload (plugin);
+ GNUNET_CONFIGURATION_destroy (cfg);
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant] branch master updated: towards fixing backend DB versioning, also fixing TALER_PQ_error_code() semantic change,
gnunet <=