[taler-anastasis] branch master updated (26b7dce -> da9920c)

[gnunet]

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

grothoff pushed a change to branch master
in repository anastasis.

    from 26b7dce  support md in TOS
     new e90fd9f  -remove dead dependency on libuuid
     new da9920c  fix tests: ensure localhost providers are available while 
running tests

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:
 contrib/provider-list.json                        | 20 ++++++++++++++++++++
 contrib/redux.countries.json                      |  6 ++++++
 src/backend/Makefile.am                           |  1 -
 src/cli/test_anastasis_reducer_recovery_no_pay.sh | 10 +++++-----
 src/reducer/anastasis_api_redux.c                 |  3 +++
 src/stasis/Makefile.am                            |  1 -
 src/testing/Makefile.am                           |  1 -
 7 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/contrib/provider-list.json b/contrib/provider-list.json
index 47e67eb..ddce9be 100644
--- a/contrib/provider-list.json
+++ b/contrib/provider-list.json
@@ -13,6 +13,26 @@
         {
             "url" : "https://v1.anastasis.lu/";,
             "name" : "Anastasis SARL, Luxembourg"
+        },
+        {
+            "url" : "http://localhost:8086/";,
+            "name" : "Data Loss Inc. #1",
+           "restricted" : "xx"
+        },
+        {
+            "url" : "http://localhost:8087/";,
+            "name" : "Data Loss Inc. #2",
+           "restricted" : "xx"
+        },
+        {
+            "url" : "http://localhost:8088/";,
+            "name" : "Data Loss Inc. #3",
+           "restricted" : "xx"
+        },
+        {
+            "url" : "http://localhost:8089/";,
+            "name" : "Data Loss Inc. #4",
+           "restricted" : "xx"
         }
     ]
 }
diff --git a/contrib/redux.countries.json b/contrib/redux.countries.json
index 03eaeb5..113cb01 100644
--- a/contrib/redux.countries.json
+++ b/contrib/redux.countries.json
@@ -85,6 +85,12 @@
            "name" : "United States of America (USA)",
            "continent" : "North America",
            "call_code" : "+1"
+       },
+       {
+           "code" : "xx",
+           "name" : "Testland",
+           "continent" : "Demoworld",
+           "call_code" : "+0"
        }
     ]
 }
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index db37478..10edef5 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -41,7 +41,6 @@ anastasis_httpd_LDADD = \
   -lgnunetjson \
   -lgnunetutil \
   -lmicrohttpd \
-  -luuid \
   $(XLIB)
 
 EXTRA_DIST = \
diff --git a/src/cli/test_anastasis_reducer_recovery_no_pay.sh 
b/src/cli/test_anastasis_reducer_recovery_no_pay.sh
index 12ac7e9..f6b1401 100755
--- a/src/cli/test_anastasis_reducer_recovery_no_pay.sh
+++ b/src/cli/test_anastasis_reducer_recovery_no_pay.sh
@@ -121,10 +121,10 @@ echo " OK"
 
 echo -n "Launching anastasis services ..."
 PREFIX="" #valgrind
-$PREFIX anastasis-httpd -c $CONF_1 2> anastasis-httpd_1.log &
-$PREFIX anastasis-httpd -c $CONF_2 2> anastasis-httpd_2.log &
-$PREFIX anastasis-httpd -c $CONF_3 2> anastasis-httpd_3.log &
-$PREFIX anastasis-httpd -c $CONF_4 2> anastasis-httpd_4.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_1 2> anastasis-httpd_1.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_2 2> anastasis-httpd_2.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_3 2> anastasis-httpd_3.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_4 2> anastasis-httpd_4.log &
 
 echo -n "Waiting for anastasis services ..."
 
@@ -180,7 +180,7 @@ anastasis-reducer -a \
     "instructions": "What is your name?",
     "challenge": "91GPWWR"
     } }' \
-  add_authentication < $B2FILE > $B1FILE
+       add_authentication < $B2FILE > $B1FILE 
 echo -n "."
 # "64S36" encodes "123"
 anastasis-reducer -a \
diff --git a/src/reducer/anastasis_api_redux.c 
b/src/reducer/anastasis_api_redux.c
index 0535883..31a389b 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -879,6 +879,9 @@ begin_provider_config_check (const char *cc,
                          cc)) )
       {
         /* skip */
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "Skipping provider restricted to country `%s'\n",
+                    restricted);
         continue;
       }
       if ( (NULL == restricted) &&
diff --git a/src/stasis/Makefile.am b/src/stasis/Makefile.am
index d1a0b39..b487bcf 100644
--- a/src/stasis/Makefile.am
+++ b/src/stasis/Makefile.am
@@ -83,7 +83,6 @@ test_anastasis_db_postgres_LDFLAGS = \
   -lgnunetpq \
   -ltalerutil \
   -ltalerpq \
-  -luuid \
   $(XLIB)
 
 AM_TESTS_ENVIRONMENT=export 
ANASTASIS_PREFIX=$${ANASTASIS_PREFIX:-@libdir@};export 
PATH=$${ANASTASIS_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index fec971a..1a369c1 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -38,7 +38,6 @@ libanastasistesting_la_LIBADD = \
   -lgnunetjson \
   -lgnunetutil \
   -ljansson \
-  -luuid \
   -ltalertesting \
   $(XLIB)
 

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