[taler-exchange] branch master updated: doxygen and spelling fixes

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new adc6c53b doxygen and spelling fixes
adc6c53b is described below

commit adc6c53b5c7e08ff6eba180f872a8a8f8f94cd65
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Sep 4 13:00:20 2021 +0200

    doxygen and spelling fixes
---
 src/auditor/auditor-basedb.sql             |  9 +++----
 src/auditor/revoke-basedb.sql              |  7 +++--
 src/benchmark/benchmark.conf               | 41 +++++++++++++++---------------
 src/benchmark/taler-aggregator-benchmark.c |  2 +-
 src/exchange/taler-exchange-aggregator.c   |  8 +++---
 src/exchangedb/exchange-0003.sql           |  2 +-
 src/include/taler_exchangedb_plugin.h      |  4 ---
 7 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/auditor/auditor-basedb.sql b/src/auditor/auditor-basedb.sql
index 5c776606..e5bd88ff 100644
--- a/src/auditor/auditor-basedb.sql
+++ b/src/auditor/auditor-basedb.sql
@@ -1424,7 +1424,7 @@ COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE 
once we have included thi
 -- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: grothoff
 --
 
-COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be 
set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies 
for colums migrated from a previous version without sharding support. 64-bit 
value because we need an *unsigned* 32-bit value.';
+COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be 
set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies 
for columns migrated from a previous version without sharding support. 64-bit 
value because we need an *unsigned* 32-bit value.';
 
 
 --
@@ -5527,9 +5527,9 @@ COPY public.merchant_accounts (account_serial, 
merchant_serial, h_wire, salt, pa
 --
 
 COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, 
contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, 
paid, wired, fulfillment_url, session_id) FROM stdin;
-1      1       2021.011-AKS8401AF50G0  
\\x7b22616d6f756e74223a22544553544b55444f533a34222c2273756d6d617279223a2268656c6c6f20776f726c64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a56425644313259
 [...]
-2      1       2021.011-01G89XA95V1FM  
\\x7b22616d6f756e74223a22544553544b55444f533a37222c2273756d6d617279223a226f7264657220746861742077696c6c20626520726566756e646564222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946
 [...]
-3      1       2021.011-0049H0MV0D6C2  
\\x7b22616d6f756e74223a22544553544b55444f533a33222c2273756d6d617279223a227061796d656e7420616674657220726566756e64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632
 [...]
+1      1       2021.011-AKS8401AF50G0  
\\x7b22616d6f756e74223a22544553544b55444f533a34222c2273756d6d617279223a2268656c6c6f20776f726c64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353937363030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632574a56425644313259
 [...]
+2      1       2021.011-01G89XA95V1FM  
\\x7b22616d6f756e74223a22544553544b55444f533a37222c2273756d6d617279223a226f7264657220746861742077696c6c20626520726566756e646564222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946
 [...]
+3      1       2021.011-0049H0MV0D6C2  
\\x7b22616d6f756e74223a22544553544b55444f533a33222c2273756d6d617279223a227061796d656e7420616674657220726566756e64222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f746878222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335353938353030307d2c2270726f6475637473223a5b5d2c22685f77697265223a225946544d4e4b385632
 [...]
 \.
 
 
@@ -8176,4 +8176,3 @@ ALTER TABLE ONLY public.aggregation_tracking
 --
 -- PostgreSQL database dump complete
 --
-
diff --git a/src/auditor/revoke-basedb.sql b/src/auditor/revoke-basedb.sql
index 9c0d7ea8..37de4e56 100644
--- a/src/auditor/revoke-basedb.sql
+++ b/src/auditor/revoke-basedb.sql
@@ -1424,7 +1424,7 @@ COMMENT ON COLUMN public.deposits.done IS 'Set to TRUE 
once we have included thi
 -- Name: COLUMN deposits.shard; Type: COMMENT; Schema: public; Owner: grothoff
 --
 
-COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be 
set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies 
for colums migrated from a previous version without sharding support. 64-bit 
value because we need an *unsigned* 32-bit value.';
+COMMENT ON COLUMN public.deposits.shard IS 'Used for load sharding. Should be 
set based on h_wire, merchant_pub and a service salt. Default of 0 onlyapplies 
for columns migrated from a previous version without sharding support. 64-bit 
value because we need an *unsigned* 32-bit value.';
 
 
 --
@@ -5528,8 +5528,8 @@ COPY public.merchant_accounts (account_serial, 
merchant_serial, h_wire, salt, pa
 --
 
 COPY public.merchant_contract_terms (order_serial, merchant_serial, order_id, 
contract_terms, h_contract_terms, creation_time, pay_deadline, refund_deadline, 
paid, wired, fulfillment_url, session_id) FROM stdin;
-1      1       2021.011-01KETW7CP9V3G  
\\x7b22616d6f756e74223a22544553544b55444f533a31222c2273756d6d617279223a22666f6f222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a3350413330354431343130
 [...]
-2      1       2021.011-03ECCKDCDQHJC  
\\x7b22616d6f756e74223a22544553544b55444f533a302e3032222c2273756d6d617279223a22626172222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a3350413330354431
 [...]
+1      1       2021.011-01KETW7CP9V3G  
\\x7b22616d6f756e74223a22544553544b55444f533a31222c2273756d6d617279223a22666f6f222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363134373030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a3350413330354431343130
 [...]
+2      1       2021.011-03ECCKDCDQHJC  
\\x7b22616d6f756e74223a22544553544b55444f533a302e3032222c2273756d6d617279223a22626172222c2266756c66696c6c6d656e745f75726c223a2274616c65723a2f2f66756c66696c6c6d656e742d737563636573732f7468616e6b2b796f75222c22726566756e645f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c22776972655f7472616e736665725f646561646c696e65223a7b22745f6d73223a313631303335363136333030307d2c2270726f6475637473223a5b5d2c22685f77697265223a22444631393444424b5a3350413330354431
 [...]
 \.
 
 
@@ -8179,4 +8179,3 @@ ALTER TABLE ONLY public.aggregation_tracking
 --
 -- PostgreSQL database dump complete
 --
-
diff --git a/src/benchmark/benchmark.conf b/src/benchmark/benchmark.conf
index 5716770c..844106cf 100644
--- a/src/benchmark/benchmark.conf
+++ b/src/benchmark/benchmark.conf
@@ -3,30 +3,31 @@
 [paths]
 # Persistent data storage for the testcase
 # This value is a default for `taler_config_home'
-taler_test_home = exchange_benchmark_home/
+TALER_TEST_HOME = exchange_benchmark_home/
 
 [taler]
 # Currency supported by the exchange (can only be one)
-currency = EUR
+CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
 
 [exchange]
-# how long is one signkey valid?
-signkey_duration = 4 weeks
-signkey_legal_duration = 2 years
-# how long do we provide to clients denomination and signing keys
-# ahead of time?
-# Keep it short so the test runs fast.
-lookahead_sign = 12h
+
+SIGNKEY_LEGAL_DURATION = 2 years
+
 # HTTP port the exchange listens to
-port = 8081
+PORT = 8081
 # Master public key used to sign the exchange's various keys
-master_public_key = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
+MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
 # How to access our database
 DB = postgres
 # Base URL of the exchange. Must be set to a URL where the
 # exchange (or the twister) is actually listening.
-base_url = "http://localhost:8081/";
+BASE_URL = "http://localhost:8081/";
+
+AGGREGATOR_SHARD_SIZE = 268435456
+#AGGREGATOR_SHARD_SIZE = 2147483648
+
+
 
 WIREWATCH_IDLE_SLEEP_INTERVAL = 5 ms
 
@@ -37,12 +38,12 @@ MASTER_PRIV_FILE = 
${TALER_DATA_HOME}/exchange/offline-keys/master.priv
 BASE_URL = "http://localhost:8083/";
 
 [exchangedb-postgres]
-config = "postgres:///talercheck"
+CONFIG = "postgres:///talercheck"
 
 [benchmark-remote-exchange]
-host = localhost
+HOST = localhost
 # Adjust $HOME to match remote target!
-dir = $HOME/repos/taler/exchange/src/benchmark
+DIR = $HOME/repos/taler/exchange/src/benchmark
 
 [bank]
 HTTP_PORT = 8082
@@ -56,22 +57,22 @@ USER_PAYTO_URI = payto://x-taler-bank/localhost:8082/42
 [exchange-account-2]
 # What is the payto://-URL of the exchange (to generate wire response)
 PAYTO_URI = "payto://x-taler-bank/localhost:8082/Exchange"
-enable_debit = YES
-enable_credit = YES
+ENABLE_DEBIT = YES
+ENABLE_CREDIT = YES
 
 [exchange-accountcredentials-2]
 # What is the bank account (with the "Taler Bank" demo system)? Must end with 
"/".
 WIRE_GATEWAY_URL = http://localhost:8082/taler-wire-gateway/Exchange/
 # Authentication information for basic authentication
 WIRE_GATEWAY_AUTH_METHOD = "basic"
-username = Exchange
-password = x
+USERNAME = Exchange
+PASSWORD = x
 
 
 [exchange-account-aggregator]
 # What is the payto://-URL of the exchange (to generate wire response)
 PAYTO_URI = "payto://aggregator-benchmark/exchangeacc"
-enable_debit = YES
+ENABLE_DEBIT = YES
 
 
 
diff --git a/src/benchmark/taler-aggregator-benchmark.c 
b/src/benchmark/taler-aggregator-benchmark.c
index 03375d4e..283ee23b 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -435,7 +435,7 @@ work (void *cls)
  * @param cls unused
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
- * @param cfg configuration
+ * @param c configuration
  */
 static void
 run (void *cls,
diff --git a/src/exchange/taler-exchange-aggregator.c 
b/src/exchange/taler-exchange-aggregator.c
index f3d65db2..893fa79f 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -353,8 +353,7 @@ refund_by_coin_cb (void *cls,
  * @param amount_with_fee amount that was deposited including fee
  * @param deposit_fee amount the exchange gets to keep as transaction fees
  * @param h_contract_terms hash of the proposal data known to merchant and 
customer
- * @param wire_deadline by which the merchant advised that he would like the
- *        wire transfer to be executed
+ * @param wire target account for the wire transfer
  * @return transaction status code,  #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT to 
continue to iterate
  */
 static enum GNUNET_DB_QueryStatus
@@ -761,9 +760,10 @@ run_aggregation (void *cls)
                                                           GNUNET_YES),
                   (unsigned long long) counter);
       release_shard (s);
-      if (GNUNET_YES == test_mode)
+      if ( (GNUNET_YES == test_mode) &&
+           (0 == counter) )
       {
-        /* in test mode, shutdown after a shard is done */
+        /* in test mode, shutdown after a shard is done with 0 work */
         GNUNET_SCHEDULER_shutdown ();
         return;
       }
diff --git a/src/exchangedb/exchange-0003.sql b/src/exchangedb/exchange-0003.sql
index e1c9273f..5a33e0fc 100644
--- a/src/exchangedb/exchange-0003.sql
+++ b/src/exchangedb/exchange-0003.sql
@@ -25,7 +25,7 @@ SELECT _v.register_patch('exchange-0003', NULL, NULL);
 ALTER TABLE deposits
   ADD COLUMN shard INT4 NOT NULL DEFAULT 0;
 COMMENT ON COLUMN deposits.shard
-  IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and 
a service salt. Default of 0 onlyapplies for colums migrated from a previous 
version without sharding support. 64-bit value because we need an *unsigned* 
32-bit value.';
+  IS 'Used for load sharding. Should be set based on h_wire, merchant_pub and 
a service salt. Default of 0 onlyapplies for columns migrated from a previous 
version without sharding support. 64-bit value because we need an *unsigned* 
32-bit value.';
 
 DROP INDEX deposits_get_ready_index;
 CREATE INDEX deposits_get_ready_index
diff --git a/src/include/taler_exchangedb_plugin.h 
b/src/include/taler_exchangedb_plugin.h
index 7d6508fc..163b886c 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -1472,15 +1472,11 @@ typedef enum GNUNET_DB_QueryStatus
  * @param cls closure
  * @param rowid unique ID for the deposit in our DB, used for marking
  *              it as 'tiny' or 'done'
- * @param exchange_timestamp when did the exchange receive the deposit
- * @param wallet_timestamp when did the wallet sign the contract
  * @param merchant_pub public key of the merchant
  * @param coin_pub public key of the coin
  * @param amount_with_fee amount that was deposited including fee
  * @param deposit_fee amount the exchange gets to keep as transaction fees
  * @param h_contract_terms hash of the proposal data known to merchant and 
customer
- * @param wire_deadline by which the merchant advised that he would like the
- *        wire transfer to be executed
  * @param receiver_wire_account wire details for the merchant, includes
  *        'url' in payto://-format;
  * @return transaction status code, #GNUNET_DB_STATUS_SUCCESS_ONE_RESULT to 
continue to iterate

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.