[taler-anastasis] branch master updated: renaming, indent

[gnunet]

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

dennis-neufeld pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new a4323c2  renaming, indent
a4323c2 is described below

commit a4323c2e8251165e32918776b05f2bb63ecbf40c
Author: Dennis Neufeld <address@hidden>
AuthorDate: Thu Apr 2 15:44:40 2020 +0000

    renaming, indent
---
 src/include/anastasis_testing_lib.h |  6 +++---
 src/lib/test_anastasis_api.c        | 16 ++++++++++------
 src/lib/test_anastasis_api.conf     |  2 +-
 src/lib/testing_api_helpers.c       |  6 +++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/include/anastasis_testing_lib.h 
b/src/include/anastasis_testing_lib.h
index dc846c9..bb994c6 100644
--- a/src/include/anastasis_testing_lib.h
+++ b/src/include/anastasis_testing_lib.h
@@ -200,8 +200,8 @@ TALER_TESTING_run_merchant (const char *config_filename,
  *         be started.
  */
 struct GNUNET_OS_Process *
-TALER_TESTING_run_anastasis (const char *config_filename,
-                             const char *anastasis_url);
+ANASTASIS_TESTING_run_anastasis (const char *config_filename,
+                                 const char *anastasis_url);
 
 
 /**
@@ -214,7 +214,7 @@ TALER_TESTING_run_anastasis (const char *config_filename,
  *         by the caller.
  */
 char *
-TALER_TESTING_prepare_anastasis (const char *config_filename);
+ANASTASIS_TESTING_prepare_anastasis (const char *config_filename);
 
 
 /* ************** Specific interpreter commands ************ */
diff --git a/src/lib/test_anastasis_api.c b/src/lib/test_anastasis_api.c
index 97c4c4a..62c5a58 100644
--- a/src/lib/test_anastasis_api.c
+++ b/src/lib/test_anastasis_api.c
@@ -295,11 +295,11 @@ main (int argc,
   if (NULL ==
       (merchant_url = TALER_TESTING_prepare_merchant (CONFIG_FILE)))
     return 77;
+  TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   if (NULL ==
-      (anastasis_url = TALER_TESTING_prepare_anastasis (CONFIG_FILE)))
+      (anastasis_url = ANASTASIS_TESTING_prepare_anastasis (CONFIG_FILE)))
     return 77;
-
   TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
@@ -314,19 +314,23 @@ main (int argc,
 
   case GNUNET_OK:
     if (NULL == (merchantd =
-                   TALER_TESTING_run_merchant (CONFIG_FILE, merchant_url)))
+                   TALER_TESTING_run_merchant (CONFIG_FILE,
+                                               merchant_url)))
       return 1;
 
     if (NULL == (anastasisd =
-                   TALER_TESTING_run_anastasis (CONFIG_FILE, anastasis_url)))
+                   ANASTASIS_TESTING_run_anastasis (CONFIG_FILE,
+                                                    anastasis_url)))
       return 1;
 
     ret = TALER_TESTING_setup_with_exchange (&run,
                                              NULL,
                                              CONFIG_FILE);
 
-    GNUNET_OS_process_kill (merchantd, SIGTERM);
-    GNUNET_OS_process_kill (anastasisd, SIGTERM);
+    GNUNET_OS_process_kill (merchantd,
+                            SIGTERM);
+    GNUNET_OS_process_kill (anastasisd,
+                            SIGTERM);
     GNUNET_OS_process_wait (merchantd);
     GNUNET_OS_process_wait (anastasisd);
     GNUNET_OS_process_destroy (merchantd);
diff --git a/src/lib/test_anastasis_api.conf b/src/lib/test_anastasis_api.conf
index c706cbd..101646a 100644
--- a/src/lib/test_anastasis_api.conf
+++ b/src/lib/test_anastasis_api.conf
@@ -154,7 +154,7 @@ DB = postgres
 PORT = 8081
 
 # Our public key
-MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
+MASTER_PUBLIC_KEY = WEC7J41PBGDN24JTNRVBFXK5JRV6CK9B8YRTWW7QGFH2GERBGH1G
 
 # Base URL of the exchange.
 BASE_URL = "http://localhost:8081/";
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index 89f435e..8d5895f 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
@@ -41,8 +41,8 @@
  *         be started.
  */
 struct GNUNET_OS_Process *
-TALER_TESTING_run_anastasis (const char *config_filename,
-                             const char *anastasis_url)
+ANASTASIS_TESTING_run_anastasis (const char *config_filename,
+                                 const char *anastasis_url)
 {
   struct GNUNET_OS_Process *anastasis_proc;
   unsigned int iter;
@@ -105,7 +105,7 @@ TALER_TESTING_run_anastasis (const char *config_filename,
  *         by the caller.
  */
 char *
-TALER_TESTING_prepare_anastasis (const char *config_filename)
+ANASTASIS_TESTING_prepare_anastasis (const char *config_filename)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg;
   unsigned long long port;

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