[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] branch master updated: clean up structure
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] branch master updated: clean up structure |
|
Date: |
Fri, 05 Feb 2021 11:35:41 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
The following commit(s) were added to refs/heads/master by this push:
new 4953dd6 clean up structure
4953dd6 is described below
commit 4953dd66ac4f9126b59934ed34a645c1743b8577
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Feb 5 11:35:38 2021 +0100
clean up structure
---
.gitignore | 35 +++--
configure.ac | 9 +-
src/Makefile.am | 2 +-
src/cli/Makefile.am | 2 +-
src/include/anastasis_service.h | 1 +
src/lib/Makefile.am | 164 +--------------------
src/reducer/Makefile.am | 35 +++++
src/{lib => reducer}/anastasis_api_backup_redux.c | 0
.../anastasis_api_recovery_redux.c | 0
src/{lib => reducer}/anastasis_api_redux.c | 0
src/{lib => reducer}/anastasis_api_redux.h | 0
src/restclient/Makefile.am | 42 ++++++
.../anastasis_api_challenge_run.c | 0
src/{lib => restclient}/anastasis_api_config.c | 0
.../anastasis_api_curl_defaults.c | 0
.../anastasis_api_curl_defaults.h | 0
.../anastasis_api_keyshare_lookup.c | 0
.../anastasis_api_policy_lookup.c | 0
.../anastasis_api_policy_store.c | 0
src/{lib => restclient}/anastasis_api_salt.c | 0
.../anastasis_api_truth_store.c | 0
src/{lib => testing}/Makefile.am | 84 +----------
src/{lib => testing}/sms_authentication.sh | 0
src/{lib => testing}/test_anastasis.c | 0
src/{lib => testing}/test_anastasis_api.c | 0
src/{lib => testing}/test_anastasis_api.conf | 2 +-
.../.config/taler/exchange/account-2.json | 0
.../.config/taler/merchant/account-3.json | 0
.../.config/taler/merchant/default.priv | 0
.../.config/taler/merchant/dtip.priv | 0
.../.config/taler/merchant/nulltip.priv | 0
.../.config/taler/merchant/reserve/dtip.priv | 0
.../.config/taler/merchant/reserve/nulltip.priv | 0
.../.config/taler/merchant/reserve/tip.priv | 0
.../.config/taler/merchant/tip.priv | Bin
.../.config/taler/merchant/tor.priv | Bin
.../.config/taler/test.json | 0
.../share/taler/exchange/offline-keys/master.priv | 0
.../.local/share/taler/merchant/merchant.priv | 0
.../testing_api_cmd_challenge_run.c | 0
.../testing_api_cmd_keyshare_lookup.c | 0
.../testing_api_cmd_policy_lookup.c | 0
.../testing_api_cmd_policy_store.c | 0
src/{lib => testing}/testing_api_cmd_salt.c | 0
src/{lib => testing}/testing_api_cmd_truth_store.c | 0
src/{lib => testing}/testing_api_helpers.c | 0
.../testing_api_trait_account_priv.c | 0
.../testing_api_trait_account_pub.c | 0
src/{lib => testing}/testing_api_trait_code.c | 0
src/{lib => testing}/testing_api_trait_hash.c | 0
.../testing_api_trait_payment_identifier.c | 0
src/{lib => testing}/testing_api_trait_salt.c | 0
src/{lib => testing}/testing_api_trait_truth_pub.c | 0
.../testing_cmd_challenge_answer.c | 0
src/{lib => testing}/testing_cmd_challenge_start.c | 0
src/{lib => testing}/testing_cmd_policy_create.c | 0
src/{lib => testing}/testing_cmd_recover_secret.c | 0
src/{lib => testing}/testing_cmd_secret_share.c | 0
src/{lib => testing}/testing_cmd_truth_upload.c | 0
src/{lib => testing}/testing_trait_challenge.c | 0
src/{lib => testing}/testing_trait_core_secret.c | 0
src/{lib => testing}/testing_trait_policy.c | 0
src/{lib => testing}/testing_trait_truth.c | 0
src/util/test_anastasis_child_management.c | 1 +
64 files changed, 113 insertions(+), 264 deletions(-)
diff --git a/.gitignore b/.gitignore
index b4dd862..9311cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,8 @@ ltmain.sh
missing
src/Makefile
src/Makefile.in
-src/util/.deps/
-src/util/.libs/
+**/.deps/
+**/.libs/
src/stasis/Makefile
src/stasis/Makefile.in
src/stasis/libanastasis_plugin_db_postgres.la
@@ -33,21 +33,22 @@ src/backend/Makefile
src/backend/Makefile.in
src/include/Makefile
src/include/Makefile.in
-src/lib/.deps/
-src/lib/.libs/
-src/lib/test_anastasis_api_home/.local/share/taler/exchange/live-keys/
-src/lib/test_anastasis_api_home/.local/share/taler/exchange/revocations/
-src/lib/test_anastasis_api_home/.local/share/taler/exchange/wirefees/
-src/lib/test_anastasis_api_home/.local/share/taler/auditors/
-src/lib/test_anastasis_api_home/.local/share/taler/auditor/
-src/lib/*.log
+src/testing/test_anastasis_api_home/.local/share/taler/exchange/live-keys/
+src/testing/test_anastasis_api_home/.local/share/taler/exchange/revocations/
+src/testing/test_anastasis_api_home/.local/share/taler/exchange/wirefees/
+src/testing/test_anastasis_api_home/.local/share/taler/auditors/
+src/testing/test_anastasis_api_home/.local/share/taler/auditor/
+src/testing/test_anastasis_api_home/.local/share/taler/taler-exchange-secmod-*/
+src/testing/test_anastasis_api_home/.local/share/taler/exchange/offline-keys/*.pub
+src/util/child_management_test.txt
+**/*.log
src/lib/*.in
-src/lib/*.o
-src/lib/*.la
-src/lib/*.lo
-src/lib/*.trs
-src/lib/Makefile
-src/lib/Makefile.in
+**/*.o
+**/*.la
+**/*.lo
+**/*.trs
+**/Makefile
+**/Makefile.in
stamp-h1
test-driver
uncrustify.cfg
@@ -113,3 +114,5 @@ doc/thesis/*.blg
doc/thesis/*.bbl
doc/thesis/*.gzsrc/cli/anastasis-reducer
contrib/anastasis.tag
+src/util/anastasis-config
+src/util/test_anastasis_child_management
diff --git a/configure.ac b/configure.ac
index ed64e49..67d2fc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -317,11 +317,14 @@ Makefile
contrib/Makefile
doc/Makefile
src/Makefile
-src/util/Makefile
-src/stasis/Makefile
src/backend/Makefile
+src/cli/Makefile
src/include/Makefile
src/lib/Makefile
-src/cli/Makefile
+src/util/Makefile
+src/reducer/Makefile
+src/restclient/Makefile
+src/stasis/Makefile
+src/testing/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 69a8be0..11a3a36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
# This Makefile is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include util stasis backend lib cli
+SUBDIRS = include util stasis backend restclient lib testing reducer cli
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index b8efb10..1272192 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -39,7 +39,7 @@ anastasis_reducer_SOURCES = \
anastasis-cli-redux.c
anastasis_reducer_LDADD = \
$(top_builddir)/src/util/libanastasisutil.la \
- $(top_builddir)/src/lib/libanastasisredux.la \
+ $(top_builddir)/src/reducer/libanastasisredux.la \
-ltalerjson \
-ltalerutil \
-lgnunetjson \
diff --git a/src/include/anastasis_service.h b/src/include/anastasis_service.h
index b0e6a26..b360383 100644
--- a/src/include/anastasis_service.h
+++ b/src/include/anastasis_service.h
@@ -628,6 +628,7 @@ typedef void
(*ANASTASIS_EscrowProviderInformation)(void *cls,
const char *policy,
const struct TALER_Amount *cost);
+
/**
* Does an EscrowProviderInspection GET /terms
* Receives an EscrowProviderInformation Callback
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9305a48..ec92c34 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,44 +6,8 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-.NOTPARALLEL:
-
lib_LTLIBRARIES = \
- libanastasisrest.la \
- libanastasis.la \
- libanastasistesting.la \
- libanastasisredux.la
-
-libanastasisrest_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasisrest_la_SOURCES = \
- anastasis_api_salt.c \
- anastasis_api_config.c \
- anastasis_api_policy_store.c \
- anastasis_api_truth_store.c \
- anastasis_api_policy_lookup.c \
- anastasis_api_keyshare_lookup.c \
- anastasis_api_challenge_run.c \
- anastasis_api_curl_defaults.c anastasis_api_curl_defaults.h
-libanastasisrest_la_LIBADD = \
- -lgnunetcurl \
- -lgnunetjson \
- -lgnunetutil \
- -ljansson \
- -ltalerjson \
- -ltalerutil \
- -ltalerjson
- $(XLIB)
-
-if HAVE_LIBCURL
-libanastasisrest_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libanastasisrest_la_LIBADD += -lgnurl
-endif
-endif
-
+ libanastasis.la
libanastasis_la_LDFLAGS = \
-version-info 0:0:0 \
@@ -52,133 +16,9 @@ libanastasis_la_SOURCES = \
anastasis.c
libanastasis_la_LIBADD = \
$(top_builddir)/src/util/libanastasisutil.la \
- $(top_builddir)/src/lib/libanastasisrest.la \
- -lgnunetutil \
- -ljansson \
- -ltalerutil \
- -ltalermerchant \
- $(XLIB)
-
-libanastasistesting_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasistesting_la_SOURCES = \
- testing_api_cmd_policy_store.c \
- testing_api_cmd_truth_store.c \
- testing_api_cmd_policy_lookup.c \
- testing_api_cmd_keyshare_lookup.c \
- testing_api_cmd_challenge_run.c \
- testing_api_cmd_salt.c \
- testing_api_helpers.c \
- testing_api_trait_account_pub.c \
- testing_api_trait_account_priv.c \
- testing_api_trait_payment_identifier.c \
- testing_api_trait_truth_pub.c \
- testing_api_trait_hash.c \
- testing_api_trait_salt.c \
- testing_api_trait_code.c \
- testing_cmd_truth_upload.c \
- testing_cmd_policy_create.c \
- testing_cmd_secret_share.c \
- testing_cmd_recover_secret.c \
- testing_cmd_challenge_answer.c \
- testing_cmd_challenge_start.c \
- testing_trait_truth.c \
- testing_trait_policy.c \
- testing_trait_core_secret.c \
- testing_trait_challenge.c
-libanastasistesting_la_LIBADD = \
- $(top_builddir)/src/lib/libanastasisrest.la \
- $(top_builddir)/src/lib/libanastasis.la \
- $(top_builddir)/src/util/libanastasisutil.la \
- -ltalerexchange \
- -ltalerjson \
- -ltalerutil \
- -lgnunetcurl \
- -lgnunetjson \
+ $(top_builddir)/src/restclient/libanastasisrest.la \
-lgnunetutil \
-ljansson \
- -luuid \
- -ltalertesting \
- $(XLIB)
-
-
-libanastasisredux_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasisredux_la_SOURCES = \
- anastasis_api_redux.c anastasis_api_redux.h \
- anastasis_api_recovery_redux.c \
- anastasis_api_backup_redux.c
-libanastasisredux_la_LIBADD = \
- $(top_builddir)/src/lib/libanastasisrest.la \
- $(top_builddir)/src/lib/libanastasis.la \
- $(top_builddir)/src/util/libanastasisutil.la \
- -lgnunetjson \
- -lgnunetcurl \
- -lgnunetutil \
- -ltalermhd \
-ltalerutil \
- -ltalerexchange \
-ltalermerchant \
- -ltalerjson \
- -ljansson \
- -ldl \
$(XLIB)
-
-
-check_PROGRAMS = \
- test_anastasisrest_api \
- test_anastasis
-
-AM_TESTS_ENVIRONMENT=export
ANASTASIS_PREFIX=$${ANASTASIS_PREFIX:-@libdir@};export
PATH=$${ANASTASIS_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset
XDG_CONFIG_HOME;
-TESTS = \
- $(check_PROGRAMS)
-
-test_anastasisrest_api_SOURCES = \
- test_anastasis_api.c
-test_anastasisrest_api_LDADD = \
- $(top_builddir)/src/stasis/libanastasisdb.la \
- $(LIBGCRYPT_LIBS) \
- -ltalertesting \
- libanastasistesting.la \
- -ltalermerchanttesting \
- -ltalerfakebank \
- -ltalerbank \
- -ltalerexchange \
- -ltalermerchant \
- -ltalerjson \
- -ltalerutil \
- -lgnunetjson \
- -lgnunetcurl \
- -lgnunetutil \
- -ljansson
-
-test_anastasis_SOURCES = \
- test_anastasis.c
-test_anastasis_LDADD = \
- $(top_builddir)/src/stasis/libanastasisdb.la \
- libanastasis.la \
- $(LIBGCRYPT_LIBS) \
- -ltalertesting \
- libanastasistesting.la \
- -ltalermerchanttesting \
- -ltalerfakebank \
- -ltalerbank \
- -ltalerexchange \
- -ltalermerchant \
- -ltalerjson \
- -ltalerutil \
- -lgnunetjson \
- -lgnunetcurl \
- -lgnunetutil \
- -ljansson
-
-EXTRA_DIST = \
- test_anastasis_api.conf \
- test_anastasis.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
diff --git a/src/reducer/Makefile.am b/src/reducer/Makefile.am
new file mode 100644
index 0000000..0480e93
--- /dev/null
+++ b/src/reducer/Makefile.am
@@ -0,0 +1,35 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend
-I$(top_srcdir)/src/lib
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+.NOTPARALLEL:
+
+lib_LTLIBRARIES = \
+ libanastasisredux.la
+
+libanastasisredux_la_LDFLAGS = \
+ -version-info 0:0:0 \
+ -no-undefined
+libanastasisredux_la_SOURCES = \
+ anastasis_api_redux.c anastasis_api_redux.h \
+ anastasis_api_recovery_redux.c \
+ anastasis_api_backup_redux.c
+libanastasisredux_la_LIBADD = \
+ $(top_builddir)/src/restclient/libanastasisrest.la \
+ $(top_builddir)/src/lib/libanastasis.la \
+ $(top_builddir)/src/util/libanastasisutil.la \
+ -lgnunetjson \
+ -lgnunetcurl \
+ -lgnunetutil \
+ -ltalermhd \
+ -ltalerutil \
+ -ltalerexchange \
+ -ltalermerchant \
+ -ltalerjson \
+ -ljansson \
+ -ldl \
+ $(XLIB)
diff --git a/src/lib/anastasis_api_backup_redux.c
b/src/reducer/anastasis_api_backup_redux.c
similarity index 100%
rename from src/lib/anastasis_api_backup_redux.c
rename to src/reducer/anastasis_api_backup_redux.c
diff --git a/src/lib/anastasis_api_recovery_redux.c
b/src/reducer/anastasis_api_recovery_redux.c
similarity index 100%
rename from src/lib/anastasis_api_recovery_redux.c
rename to src/reducer/anastasis_api_recovery_redux.c
diff --git a/src/lib/anastasis_api_redux.c b/src/reducer/anastasis_api_redux.c
similarity index 100%
rename from src/lib/anastasis_api_redux.c
rename to src/reducer/anastasis_api_redux.c
diff --git a/src/lib/anastasis_api_redux.h b/src/reducer/anastasis_api_redux.h
similarity index 100%
rename from src/lib/anastasis_api_redux.h
rename to src/reducer/anastasis_api_redux.h
diff --git a/src/restclient/Makefile.am b/src/restclient/Makefile.am
new file mode 100644
index 0000000..cdec57e
--- /dev/null
+++ b/src/restclient/Makefile.am
@@ -0,0 +1,42 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend
-I$(top_srcdir)/src/lib
+
+if USE_COVERAGE
+ AM_CFLAGS = --coverage -O0
+ XLIB = -lgcov
+endif
+
+.NOTPARALLEL:
+
+lib_LTLIBRARIES = \
+ libanastasisrest.la
+
+libanastasisrest_la_LDFLAGS = \
+ -version-info 0:0:0 \
+ -no-undefined
+libanastasisrest_la_SOURCES = \
+ anastasis_api_salt.c \
+ anastasis_api_config.c \
+ anastasis_api_policy_store.c \
+ anastasis_api_truth_store.c \
+ anastasis_api_policy_lookup.c \
+ anastasis_api_keyshare_lookup.c \
+ anastasis_api_challenge_run.c \
+ anastasis_api_curl_defaults.c anastasis_api_curl_defaults.h
+libanastasisrest_la_LIBADD = \
+ -lgnunetcurl \
+ -lgnunetjson \
+ -lgnunetutil \
+ -ljansson \
+ -ltalerjson \
+ -ltalerutil \
+ -ltalerjson
+ $(XLIB)
+
+if HAVE_LIBCURL
+libanastasisrest_la_LIBADD += -lcurl
+else
+if HAVE_LIBGNURL
+libanastasisrest_la_LIBADD += -lgnurl
+endif
+endif
diff --git a/src/lib/anastasis_api_challenge_run.c
b/src/restclient/anastasis_api_challenge_run.c
similarity index 100%
rename from src/lib/anastasis_api_challenge_run.c
rename to src/restclient/anastasis_api_challenge_run.c
diff --git a/src/lib/anastasis_api_config.c
b/src/restclient/anastasis_api_config.c
similarity index 100%
rename from src/lib/anastasis_api_config.c
rename to src/restclient/anastasis_api_config.c
diff --git a/src/lib/anastasis_api_curl_defaults.c
b/src/restclient/anastasis_api_curl_defaults.c
similarity index 100%
rename from src/lib/anastasis_api_curl_defaults.c
rename to src/restclient/anastasis_api_curl_defaults.c
diff --git a/src/lib/anastasis_api_curl_defaults.h
b/src/restclient/anastasis_api_curl_defaults.h
similarity index 100%
rename from src/lib/anastasis_api_curl_defaults.h
rename to src/restclient/anastasis_api_curl_defaults.h
diff --git a/src/lib/anastasis_api_keyshare_lookup.c
b/src/restclient/anastasis_api_keyshare_lookup.c
similarity index 100%
rename from src/lib/anastasis_api_keyshare_lookup.c
rename to src/restclient/anastasis_api_keyshare_lookup.c
diff --git a/src/lib/anastasis_api_policy_lookup.c
b/src/restclient/anastasis_api_policy_lookup.c
similarity index 100%
rename from src/lib/anastasis_api_policy_lookup.c
rename to src/restclient/anastasis_api_policy_lookup.c
diff --git a/src/lib/anastasis_api_policy_store.c
b/src/restclient/anastasis_api_policy_store.c
similarity index 100%
rename from src/lib/anastasis_api_policy_store.c
rename to src/restclient/anastasis_api_policy_store.c
diff --git a/src/lib/anastasis_api_salt.c b/src/restclient/anastasis_api_salt.c
similarity index 100%
rename from src/lib/anastasis_api_salt.c
rename to src/restclient/anastasis_api_salt.c
diff --git a/src/lib/anastasis_api_truth_store.c
b/src/restclient/anastasis_api_truth_store.c
similarity index 100%
rename from src/lib/anastasis_api_truth_store.c
rename to src/restclient/anastasis_api_truth_store.c
diff --git a/src/lib/Makefile.am b/src/testing/Makefile.am
similarity index 59%
copy from src/lib/Makefile.am
copy to src/testing/Makefile.am
index 9305a48..5ef710a 100644
--- a/src/lib/Makefile.am
+++ b/src/testing/Makefile.am
@@ -6,58 +6,8 @@ if USE_COVERAGE
XLIB = -lgcov
endif
-.NOTPARALLEL:
-
lib_LTLIBRARIES = \
- libanastasisrest.la \
- libanastasis.la \
- libanastasistesting.la \
- libanastasisredux.la
-
-libanastasisrest_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasisrest_la_SOURCES = \
- anastasis_api_salt.c \
- anastasis_api_config.c \
- anastasis_api_policy_store.c \
- anastasis_api_truth_store.c \
- anastasis_api_policy_lookup.c \
- anastasis_api_keyshare_lookup.c \
- anastasis_api_challenge_run.c \
- anastasis_api_curl_defaults.c anastasis_api_curl_defaults.h
-libanastasisrest_la_LIBADD = \
- -lgnunetcurl \
- -lgnunetjson \
- -lgnunetutil \
- -ljansson \
- -ltalerjson \
- -ltalerutil \
- -ltalerjson
- $(XLIB)
-
-if HAVE_LIBCURL
-libanastasisrest_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libanastasisrest_la_LIBADD += -lgnurl
-endif
-endif
-
-
-libanastasis_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasis_la_SOURCES = \
- anastasis.c
-libanastasis_la_LIBADD = \
- $(top_builddir)/src/util/libanastasisutil.la \
- $(top_builddir)/src/lib/libanastasisrest.la \
- -lgnunetutil \
- -ljansson \
- -ltalerutil \
- -ltalermerchant \
- $(XLIB)
+ libanastasistesting.la
libanastasistesting_la_LDFLAGS = \
-version-info 0:0:0 \
@@ -88,10 +38,11 @@ libanastasistesting_la_SOURCES = \
testing_trait_core_secret.c \
testing_trait_challenge.c
libanastasistesting_la_LIBADD = \
- $(top_builddir)/src/lib/libanastasisrest.la \
+ $(top_builddir)/src/restclient/libanastasisrest.la \
$(top_builddir)/src/lib/libanastasis.la \
$(top_builddir)/src/util/libanastasisutil.la \
-ltalerexchange \
+ -ltalermerchant \
-ltalerjson \
-ltalerutil \
-lgnunetcurl \
@@ -103,30 +54,6 @@ libanastasistesting_la_LIBADD = \
$(XLIB)
-libanastasisredux_la_LDFLAGS = \
- -version-info 0:0:0 \
- -no-undefined
-libanastasisredux_la_SOURCES = \
- anastasis_api_redux.c anastasis_api_redux.h \
- anastasis_api_recovery_redux.c \
- anastasis_api_backup_redux.c
-libanastasisredux_la_LIBADD = \
- $(top_builddir)/src/lib/libanastasisrest.la \
- $(top_builddir)/src/lib/libanastasis.la \
- $(top_builddir)/src/util/libanastasisutil.la \
- -lgnunetjson \
- -lgnunetcurl \
- -lgnunetutil \
- -ltalermhd \
- -ltalerutil \
- -ltalerexchange \
- -ltalermerchant \
- -ltalerjson \
- -ljansson \
- -ldl \
- $(XLIB)
-
-
check_PROGRAMS = \
test_anastasisrest_api \
test_anastasis
@@ -176,9 +103,6 @@ test_anastasis_LDADD = \
EXTRA_DIST = \
test_anastasis_api.conf \
- test_anastasis.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
+ sms_authentication.sh
diff --git a/src/lib/sms_authentication.sh b/src/testing/sms_authentication.sh
similarity index 100%
rename from src/lib/sms_authentication.sh
rename to src/testing/sms_authentication.sh
diff --git a/src/lib/test_anastasis.c b/src/testing/test_anastasis.c
similarity index 100%
rename from src/lib/test_anastasis.c
rename to src/testing/test_anastasis.c
diff --git a/src/lib/test_anastasis_api.c b/src/testing/test_anastasis_api.c
similarity index 100%
rename from src/lib/test_anastasis_api.c
rename to src/testing/test_anastasis_api.c
diff --git a/src/lib/test_anastasis_api.conf
b/src/testing/test_anastasis_api.conf
similarity index 98%
rename from src/lib/test_anastasis_api.conf
rename to src/testing/test_anastasis_api.conf
index 17526a8..0c01271 100644
--- a/src/lib/test_anastasis_api.conf
+++ b/src/testing/test_anastasis_api.conf
@@ -80,7 +80,7 @@ FILE_COST = EUR:1
#VIDEO_COST = EUR:0
# Command which is executed for the sms authentication
-SMSAUTH_COMMAND =
/home/dominik/Documents/Anastasis-work/anastasis/src/lib/sms_authentication.sh
+SMSAUTH_COMMAND = ./sms_authentication.sh
# Command which is executed for the sms authentication
# EMAILAUTH_COMMAND =
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/exchange/account-2.json
b/src/testing/test_anastasis_api_home/.config/taler/exchange/account-2.json
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.config/taler/exchange/account-2.json
rename to
src/testing/test_anastasis_api_home/.config/taler/exchange/account-2.json
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/account-3.json
b/src/testing/test_anastasis_api_home/.config/taler/merchant/account-3.json
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.config/taler/merchant/account-3.json
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/account-3.json
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/default.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/default.priv
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/merchant/default.priv
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/default.priv
diff --git a/src/lib/test_anastasis_api_home/.config/taler/merchant/dtip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/dtip.priv
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/merchant/dtip.priv
rename to src/testing/test_anastasis_api_home/.config/taler/merchant/dtip.priv
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/nulltip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/nulltip.priv
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/merchant/nulltip.priv
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/nulltip.priv
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/dtip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/dtip.priv
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/dtip.priv
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/dtip.priv
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/nulltip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/nulltip.priv
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/nulltip.priv
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/nulltip.priv
diff --git
a/src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/tip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/tip.priv
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.config/taler/merchant/reserve/tip.priv
rename to
src/testing/test_anastasis_api_home/.config/taler/merchant/reserve/tip.priv
diff --git a/src/lib/test_anastasis_api_home/.config/taler/merchant/tip.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/tip.priv
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/merchant/tip.priv
rename to src/testing/test_anastasis_api_home/.config/taler/merchant/tip.priv
diff --git a/src/lib/test_anastasis_api_home/.config/taler/merchant/tor.priv
b/src/testing/test_anastasis_api_home/.config/taler/merchant/tor.priv
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/merchant/tor.priv
rename to src/testing/test_anastasis_api_home/.config/taler/merchant/tor.priv
diff --git a/src/lib/test_anastasis_api_home/.config/taler/test.json
b/src/testing/test_anastasis_api_home/.config/taler/test.json
similarity index 100%
rename from src/lib/test_anastasis_api_home/.config/taler/test.json
rename to src/testing/test_anastasis_api_home/.config/taler/test.json
diff --git
a/src/lib/test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv
b/src/testing/test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv
rename to
src/testing/test_anastasis_api_home/.local/share/taler/exchange/offline-keys/master.priv
diff --git
a/src/lib/test_anastasis_api_home/.local/share/taler/merchant/merchant.priv
b/src/testing/test_anastasis_api_home/.local/share/taler/merchant/merchant.priv
similarity index 100%
rename from
src/lib/test_anastasis_api_home/.local/share/taler/merchant/merchant.priv
rename to
src/testing/test_anastasis_api_home/.local/share/taler/merchant/merchant.priv
diff --git a/src/lib/testing_api_cmd_challenge_run.c
b/src/testing/testing_api_cmd_challenge_run.c
similarity index 100%
rename from src/lib/testing_api_cmd_challenge_run.c
rename to src/testing/testing_api_cmd_challenge_run.c
diff --git a/src/lib/testing_api_cmd_keyshare_lookup.c
b/src/testing/testing_api_cmd_keyshare_lookup.c
similarity index 100%
rename from src/lib/testing_api_cmd_keyshare_lookup.c
rename to src/testing/testing_api_cmd_keyshare_lookup.c
diff --git a/src/lib/testing_api_cmd_policy_lookup.c
b/src/testing/testing_api_cmd_policy_lookup.c
similarity index 100%
rename from src/lib/testing_api_cmd_policy_lookup.c
rename to src/testing/testing_api_cmd_policy_lookup.c
diff --git a/src/lib/testing_api_cmd_policy_store.c
b/src/testing/testing_api_cmd_policy_store.c
similarity index 100%
rename from src/lib/testing_api_cmd_policy_store.c
rename to src/testing/testing_api_cmd_policy_store.c
diff --git a/src/lib/testing_api_cmd_salt.c b/src/testing/testing_api_cmd_salt.c
similarity index 100%
rename from src/lib/testing_api_cmd_salt.c
rename to src/testing/testing_api_cmd_salt.c
diff --git a/src/lib/testing_api_cmd_truth_store.c
b/src/testing/testing_api_cmd_truth_store.c
similarity index 100%
rename from src/lib/testing_api_cmd_truth_store.c
rename to src/testing/testing_api_cmd_truth_store.c
diff --git a/src/lib/testing_api_helpers.c b/src/testing/testing_api_helpers.c
similarity index 100%
rename from src/lib/testing_api_helpers.c
rename to src/testing/testing_api_helpers.c
diff --git a/src/lib/testing_api_trait_account_priv.c
b/src/testing/testing_api_trait_account_priv.c
similarity index 100%
rename from src/lib/testing_api_trait_account_priv.c
rename to src/testing/testing_api_trait_account_priv.c
diff --git a/src/lib/testing_api_trait_account_pub.c
b/src/testing/testing_api_trait_account_pub.c
similarity index 100%
rename from src/lib/testing_api_trait_account_pub.c
rename to src/testing/testing_api_trait_account_pub.c
diff --git a/src/lib/testing_api_trait_code.c
b/src/testing/testing_api_trait_code.c
similarity index 100%
rename from src/lib/testing_api_trait_code.c
rename to src/testing/testing_api_trait_code.c
diff --git a/src/lib/testing_api_trait_hash.c
b/src/testing/testing_api_trait_hash.c
similarity index 100%
rename from src/lib/testing_api_trait_hash.c
rename to src/testing/testing_api_trait_hash.c
diff --git a/src/lib/testing_api_trait_payment_identifier.c
b/src/testing/testing_api_trait_payment_identifier.c
similarity index 100%
rename from src/lib/testing_api_trait_payment_identifier.c
rename to src/testing/testing_api_trait_payment_identifier.c
diff --git a/src/lib/testing_api_trait_salt.c
b/src/testing/testing_api_trait_salt.c
similarity index 100%
rename from src/lib/testing_api_trait_salt.c
rename to src/testing/testing_api_trait_salt.c
diff --git a/src/lib/testing_api_trait_truth_pub.c
b/src/testing/testing_api_trait_truth_pub.c
similarity index 100%
rename from src/lib/testing_api_trait_truth_pub.c
rename to src/testing/testing_api_trait_truth_pub.c
diff --git a/src/lib/testing_cmd_challenge_answer.c
b/src/testing/testing_cmd_challenge_answer.c
similarity index 100%
rename from src/lib/testing_cmd_challenge_answer.c
rename to src/testing/testing_cmd_challenge_answer.c
diff --git a/src/lib/testing_cmd_challenge_start.c
b/src/testing/testing_cmd_challenge_start.c
similarity index 100%
rename from src/lib/testing_cmd_challenge_start.c
rename to src/testing/testing_cmd_challenge_start.c
diff --git a/src/lib/testing_cmd_policy_create.c
b/src/testing/testing_cmd_policy_create.c
similarity index 100%
rename from src/lib/testing_cmd_policy_create.c
rename to src/testing/testing_cmd_policy_create.c
diff --git a/src/lib/testing_cmd_recover_secret.c
b/src/testing/testing_cmd_recover_secret.c
similarity index 100%
rename from src/lib/testing_cmd_recover_secret.c
rename to src/testing/testing_cmd_recover_secret.c
diff --git a/src/lib/testing_cmd_secret_share.c
b/src/testing/testing_cmd_secret_share.c
similarity index 100%
rename from src/lib/testing_cmd_secret_share.c
rename to src/testing/testing_cmd_secret_share.c
diff --git a/src/lib/testing_cmd_truth_upload.c
b/src/testing/testing_cmd_truth_upload.c
similarity index 100%
rename from src/lib/testing_cmd_truth_upload.c
rename to src/testing/testing_cmd_truth_upload.c
diff --git a/src/lib/testing_trait_challenge.c
b/src/testing/testing_trait_challenge.c
similarity index 100%
rename from src/lib/testing_trait_challenge.c
rename to src/testing/testing_trait_challenge.c
diff --git a/src/lib/testing_trait_core_secret.c
b/src/testing/testing_trait_core_secret.c
similarity index 100%
rename from src/lib/testing_trait_core_secret.c
rename to src/testing/testing_trait_core_secret.c
diff --git a/src/lib/testing_trait_policy.c b/src/testing/testing_trait_policy.c
similarity index 100%
rename from src/lib/testing_trait_policy.c
rename to src/testing/testing_trait_policy.c
diff --git a/src/lib/testing_trait_truth.c b/src/testing/testing_trait_truth.c
similarity index 100%
rename from src/lib/testing_trait_truth.c
rename to src/testing/testing_trait_truth.c
diff --git a/src/util/test_anastasis_child_management.c
b/src/util/test_anastasis_child_management.c
index d4f421e..c16670a 100644
--- a/src/util/test_anastasis_child_management.c
+++ b/src/util/test_anastasis_child_management.c
@@ -76,6 +76,7 @@ child_completed_callback (void *cls,
}
GNUNET_OS_process_destroy (pid);
pid = NULL;
+ GNUNET_break (0 == unlink ("child_management_test.txt"));
GNUNET_SCHEDULER_shutdown ();
global_ret = 0;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis] branch master updated: clean up structure,
gnunet <=