gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-exchange] branch master updated (663f26a -> ed8dfac)


From: gnunet
Subject: [GNUnet-SVN] [taler-exchange] branch master updated (663f26a -> ed8dfac)
Date: Wed, 28 Feb 2018 16:21:31 +0100

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

marcello pushed a change to branch master
in repository exchange.

    from 663f26a  fix reject test command.
     new 6b7ad9c  indent
     new ed8dfac  helpers return exchange base url from config.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/bank-lib/testing_api_cmd_history.c             | 16 ++++-----
 .../test_exchange_api_keys_cherry_picking_new.c    |  7 +++-
 src/exchange-lib/test_exchange_api_new.c           | 39 +++++++++++-----------
 src/exchange-lib/testing_api_helpers.c             | 18 +++++++++-
 src/include/taler_testing_lib.h                    |  6 +++-
 5 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/src/bank-lib/testing_api_cmd_history.c 
b/src/bank-lib/testing_api_cmd_history.c
index 51d6ad3..da2dd7e 100644
--- a/src/bank-lib/testing_api_cmd_history.c
+++ b/src/bank-lib/testing_api_cmd_history.c
@@ -36,21 +36,21 @@
 
 struct HistoryState
 {
-   const char *bank_url;
+  const char *bank_url;
 
-   uint64_t account_no;
+  uint64_t account_no;
 
-   enum TALER_BANK_Direction direction;
+  enum TALER_BANK_Direction direction;
 
-   const char *start_row_reference;
+  const char *start_row_reference;
 
-   unsigned int num_results;
+  unsigned int num_results;
 
-   struct TALER_BANK_HistoryHandle *hh;
+  struct TALER_BANK_HistoryHandle *hh;
 
-   uint64_t results_obtained;
+  uint64_t results_obtained;
 
-   int failed;
+  int failed;
 };
 
 /**
diff --git a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c 
b/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
index c32d642..773fc71 100644
--- a/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
+++ b/src/exchange-lib/test_exchange_api_keys_cherry_picking_new.c
@@ -47,6 +47,10 @@
 #define CONFIG_FILE_EXTENDED \
   "test_exchange_api_keys_cherry_picking_extended.conf"
 
+/**
+ * Exchange base URL; mainly purpose is to make the compiler happy.
+ */
+char *exchange_url;
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -107,7 +111,8 @@ main (int argc,
   /* @helpers.  Run keyup, create tables, ... Note: it
    * fetches the port number from config in order to see
    * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (CONFIG_FILE))
+  switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
+                                          &exchange_url))
   {
   case GNUNET_SYSERR:
     GNUNET_break (0);
diff --git a/src/exchange-lib/test_exchange_api_new.c 
b/src/exchange-lib/test_exchange_api_new.c
index 870f920..c3e1ce8 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/src/exchange-lib/test_exchange_api_new.c
@@ -49,11 +49,11 @@
 static char *fakebank_url;
 
 /**
- * FIXME: what about putting exchange_url also global
- * here?  Right now, the exchange port is being "bounced"
- * between functions before exchange_url is constructed
- * and TALER_EXCHANGE_connect() is called with that.
+ * Exchange base URL as it appears in the configuration.  Note
+ * that it might differ from the one where the exchange actually
+ * listens from.
  */
+static char *exchange_url;
 
 /**
  * Account number of the exchange at the bank.
@@ -103,7 +103,7 @@ static char *fakebank_url;
 #define CMD_TRANSFER_TO_EXCHANGE(label,amount) \
    TALER_TESTING_cmd_fakebank_transfer (label, amount, \
      fakebank_url, USER_ACCOUNT_NO, EXCHANGE_ACCOUNT_NO, \
-     USER_LOGIN_NAME, USER_LOGIN_PASS, "https://exchange.com/";)
+     USER_LOGIN_NAME, USER_LOGIN_PASS, exchange_url)
 
 /**
  * Run wire transfer of funds from some user's account to the
@@ -116,7 +116,7 @@ static char *fakebank_url;
    TALER_TESTING_cmd_fakebank_transfer_with_subject \
      (label, amount, fakebank_url, USER_ACCOUNT_NO, \
       EXCHANGE_ACCOUNT_NO, USER_LOGIN_NAME, USER_LOGIN_PASS, \
-      subject, "https://exchange.com/";)
+      subject, exchange_url)
 
 /**
  * Main function that will tell the interpreter what commands to
@@ -391,23 +391,23 @@ run (void *cls,
      * Check all the transfers took place.
      */
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-499c", "https://exchange.com/";,
+      ("check_bank_transfer-499c", exchange_url,
        "EUR:4.98", 2, 42),
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-99c1", "https://exchange.com/";,
+      ("check_bank_transfer-99c1", exchange_url,
        "EUR:0.98", 2, 42),
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-99c2", "https://exchange.com/";,
+      ("check_bank_transfer-99c2", exchange_url,
        "EUR:0.98", 2, 42),
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-99c", "https://exchange.com/";,
+      ("check_bank_transfer-99c", exchange_url,
        "EUR:0.08", 2, 43),
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-aai-1", "https://exchange.com/";,
+      ("check_bank_transfer-aai-1", exchange_url,
        "EUR:5.01", 42, 2),
 
     /**
@@ -415,7 +415,7 @@ run (void *cls,
      * command with debit account == 424.
      */
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-aai-2", "https://exchange.com/";,
+      ("check_bank_transfer-aai-2", exchange_url,
        "EUR:5.01", 42, 2),
 
     TALER_TESTING_cmd_check_bank_empty ("check_bank_empty"),
@@ -486,7 +486,7 @@ run (void *cls,
      */
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-pre-refund", "https://exchange.com/";,
+      ("check_bank_transfer-pre-refund", exchange_url,
        "EUR:5.01", 42, 2),
 
     TALER_TESTING_cmd_check_bank_empty
@@ -520,7 +520,7 @@ run (void *cls,
      * Check that deposit did run.
      */
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-pre-refund", "https://exchange.com/";,
+      ("check_bank_transfer-pre-refund", exchange_url,
        "EUR:4.97", 2, 42),
 
     /**
@@ -549,7 +549,7 @@ run (void *cls,
                                        MHD_HTTP_OK),
 
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-aai-3b", "https://exchange.com/";,
+      ("check_bank_transfer-aai-3b", exchange_url,
        "EUR:5.01", 42, 2),
 
 
@@ -706,13 +706,13 @@ run (void *cls,
 
     /* check that we are empty before the rejection test */
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-pr1", "https://exchange.com/";,
+      ("check_bank_transfer-pr1", exchange_url,
        "EUR:5.01", 42, 2),
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-pr2", "https://exchange.com/";,
+      ("check_bank_transfer-pr2", exchange_url,
        "EUR:2.02", 42, 2),
     TALER_TESTING_cmd_check_bank_transfer
-      ("check_bank_transfer-pr3", "https://exchange.com/";,
+      ("check_bank_transfer-pr3", exchange_url,
        "EUR:1.01", 42, 2),
 
     TALER_TESTING_cmd_check_bank_empty ("check-empty-again"),
@@ -759,7 +759,8 @@ main (int argc,
   /* @helpers.  Run keyup, create tables, ... Note: it
    * fetches the port number from config in order to see
    * if it's available. */
-  switch (TALER_TESTING_prepare_exchange (CONFIG_FILE))
+  switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
+                                          &exchange_url))
   {
   case GNUNET_SYSERR:
     GNUNET_break (0);
diff --git a/src/exchange-lib/testing_api_helpers.c 
b/src/exchange-lib/testing_api_helpers.c
index 690c222..50ee5e2 100644
--- a/src/exchange-lib/testing_api_helpers.c
+++ b/src/exchange-lib/testing_api_helpers.c
@@ -73,11 +73,15 @@ TALER_TESTING_cleanup_files (const char *config_name)
  * launch the exchange process itself.
  *
  * @param config_filename configuration file to use
+ * @param base_url[out] will be set to the exchange base url,
+ *        if the config has any; otherwise it will be set to
+ *        NULL.
  * @return #GNUNET_OK on success, #GNUNET_NO if test should be
  *         skipped, #GNUNET_SYSERR on test failure
  */
 int
-TALER_TESTING_prepare_exchange (const char *config_filename)
+TALER_TESTING_prepare_exchange (const char *config_filename,
+                                char **base_url)
 {
   struct GNUNET_OS_Process *proc;
   enum GNUNET_OS_ProcessStatusType type;
@@ -110,6 +114,18 @@ TALER_TESTING_prepare_exchange (const char 
*config_filename)
     (cfg, config_filename))
     return GNUNET_SYSERR;
 
+   if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             "exchange",
+                                             "BASE_URL",
+                                             base_url))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
+                               "exchange",
+                               "BASE_URL");
+    *base_url = NULL;
+  }
+
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (cfg,
                                              "paths",
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index d06105d..3914208 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -99,11 +99,15 @@ TALER_TESTING_find_pk (const struct TALER_EXCHANGE_Keys 
*keys,
  * launch the exchange process itself.
  *
  * @param config_filename configuration file to use
+ * @param base_url[out] will be set to the exchange base url,
+ *        if the config has any; otherwise it will be set to
+ *        NULL.
  * @return #GNUNET_OK on success, #GNUNET_NO if test should be
  *         skipped, #GNUNET_SYSERR on test failure
  */
 int
-TALER_TESTING_prepare_exchange (const char *config_filename);
+TALER_TESTING_prepare_exchange (const char *config_filename,
+                                char **base_url);
 
 
 /**

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]