[taler-anastasis] 01/02: fix for api test (didn't start before, not passing yet)

[gnunet]

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

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

commit a4c60d927052822ea7400729009bb04b6ec4ec53
Author: Dennis Neufeld <address@hidden>
AuthorDate: Sat Apr 4 08:58:48 2020 +0000

    fix for api test (didn't start before, not passing yet)
---
 src/lib/Makefile.am                    |  9 ++++++---
 src/lib/test_anastasis_api.conf        | 30 ++++++++++++++++++++++++++----
 src/lib/testing_api_cmd_policy_store.c |  3 +--
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1be06a7..ea2da4a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -23,6 +23,8 @@ libanastasisrest_la_SOURCES = \
   anastasis_api_policy_lookup.c \
   anastasis_api_curl_defaults.c anastasis_api_curl_defaults.h
 libanastasisrest_la_LIBADD = \
+  -lgnunetcurl \
+  -lgnunetjson \
   -lgnunetutil \
   -ljansson \
   -ltalerutil \
@@ -103,7 +105,8 @@ test_anastasisrest_api_LDADD = \
 
 EXTRA_DIST = \
   test_anastasis_api.conf \
+  test_anastasis_api_home/.config/taler/exchange/account-2.json \
   test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv 
\
-  test_anastasis_api_home/.config/taler/merchant/wire/test.json \
-  test_anastasis_api_home/.config/taler/test.json \
-  test_merchant.priv
+  #test_anastasis_api_home/.config/taler/merchant/wire/test.json \
+  #test_anastasis_api_home/.config/taler/test.json \
+  #test_merchant.priv
diff --git a/src/lib/test_anastasis_api.conf b/src/lib/test_anastasis_api.conf
index 101646a..fa520f7 100644
--- a/src/lib/test_anastasis_api.conf
+++ b/src/lib/test_anastasis_api.conf
@@ -5,13 +5,13 @@
 TALER_TEST_HOME = test_anastasis_api_home/
 
 # Persistant data storage
-TALER_DATA_HOME = $TALER_HOME/.local/share/taler/
+TALER_DATA_HOME = $TALER_TEST_HOME/.local/share/taler/
 
 # Configuration files
-TALER_CONFIG_HOME = $TALER_HOME/.config/taler/
+TALER_CONFIG_HOME = $TALER_TEST_HOME/.config/taler/
 
 # Cached data, no big deal if lost
-TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
+TALER_CACHE_HOME = $TALER_TEST_HOME/.cache/taler/
 
 [taler]
 # What currency do we use?
@@ -154,11 +154,33 @@ DB = postgres
 PORT = 8081
 
 # Our public key
-MASTER_PUBLIC_KEY = WEC7J41PBGDN24JTNRVBFXK5JRV6CK9B8YRTWW7QGFH2GERBGH1G
+MASTER_PUBLIC_KEY = T1VVFQZZARQ1CMF4BN58EE7SKTW5AV2BS18S87ZEGYS4S29J6DNG
 
 # Base URL of the exchange.
 BASE_URL = "http://localhost:8081/";
 
+
+##############################################################
+## Added following lines because they were complaint in log ##
+# START
+
+# Where do we store the private keys the exchange needs at
+# runtime? (Denomination and signing keys are then stored
+# in respective subdirectories.)
+KEYDIR = ${TALER_DATA_HOME}/exchange/live-keys/
+
+# Directory where the exchange expects to find revocation
+# certificates (and where taler-exchange-keyup will write them).
+REVOCATION_DIR = ${TALER_DATA_HOME}/exchange/revocations/
+
+# Network configuration for the normal API/service HTTP server
+# serve via tcp socket (on PORT)
+SERVE = tcp
+
+# END
+##############################################################
+
+
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"
 
diff --git a/src/lib/testing_api_cmd_policy_store.c 
b/src/lib/testing_api_cmd_policy_store.c
index 088dcc9..b6e7af0 100644
--- a/src/lib/testing_api_cmd_policy_store.c
+++ b/src/lib/testing_api_cmd_policy_store.c
@@ -258,6 +258,7 @@ policy_store_run (void *cls,
                   struct TALER_TESTING_Interpreter *is)
 {
   struct PolicyStoreState *pss = cls;
+
   pss->is = is;
   if (NULL != pss->prev_upload)
   {
@@ -354,12 +355,10 @@ policy_store_run (void *cls,
     GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
                                 &pss->prev_hash,
                                 sizeof (struct GNUNET_HashCode));
-
   // hash recovery data
   GNUNET_CRYPTO_hash (pss->recovery_data,
                       pss->recovery_data_size,
                       &pss->curr_hash);
-
   pss->pso = ANASTASIS_policy_store (is->ctx,
                                      pss->anastasis_url,
                                      &pss->anastasis_priv,

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