-move to reclaim

6 files changed, 20 insertions, 56 deletions

diff --git a/src/did/.gitignore b/src/did/.gitignore
deleted file mode 100644
index d47f720ff..000000000
--- a/src/did/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test_w3c_ed25519_2020
-gnunet-did
diff --git a/src/did/Makefile.am b/src/did/Makefile.am
deleted file mode 100644
index 3f5e3f34b..000000000
--- a/src/did/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-plugindir = $(libdir)/gnunet
-
-if USE_COVERAGE
-        AM_CFLAGS = --coverage -O0
-        XLIB = -lgcov
-endif
-
-bin_PROGRAMS = \
-        gnunet-did
-
-gnunet_did_SOURCES = \
-        gnunet-did.c
-gnunet_did_LDADD = \
-        $(top_builddir)/src/util/libgnunetutil.la \
-        $(top_builddir)/src/gns/libgnunetgns.la \
-        $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
-        $(top_builddir)/src/identity/libgnunetidentity.la \
-        $(top_builddir)/src/namestore/libgnunetnamestore.la \
-        -ljansson
-
-
-check_PROGRAMS = \
-  test_w3c_ed25519_2020
-
-test_w3c_ed25519_2020_SOURCES = \
-  test_w3c_ed25519_2020.c
-test_w3c_ed25519_2020_LDADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
-
-if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
-endif
-
-
diff --git a/src/did/default_did_document.json b/src/did/default_did_document.json
deleted file mode 100644
index 61675a886..000000000
--- a/src/did/default_did_document.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "@context": [
-      "https://www.w3.org/ns/did/v1",
-      "https://w3id.org/security/suites/ed25519-2020/v1"
-    ],
-    "id": "did:example:123",
-    "authentication": [
-      {
-        "id": "did:example:123#z6MkecaLyHuYWkayBDLw5ihndj3T1m6zKTGqau3A51G7RBf3",
-        "type": "Ed25519VerificationKey2020",
-        "controller": "did:example:123",
-        "publicKeyMultibase": "zAKJP3f7BD6W4iWEQ9jwndVTCBq8ua2Utt8EEjJ6Vxsf"
-      }
-    ]
-}
\ No newline at end of file
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 350d77d4b..6b5934a2f 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -43,7 +43,8 @@ plugin_LTLIBRARIES = \
   $(REST_PLUGIN)
 
 bin_PROGRAMS = \
- gnunet-reclaim
+ gnunet-reclaim \
+ gnunet-did
 
 libexec_PROGRAMS = \
  gnunet-service-reclaim
@@ -187,13 +188,30 @@ test_reclaim_attribute_LDADD = \
   libgnunetreclaim.la \
   $(GN_LIBINTL)
 
+gnunet_did_SOURCES = \
+        gnunet-did.c
+gnunet_did_LDADD = \
+        $(top_builddir)/src/util/libgnunetutil.la \
+        $(top_builddir)/src/gns/libgnunetgns.la \
+        $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+        $(top_builddir)/src/identity/libgnunetidentity.la \
+        $(top_builddir)/src/namestore/libgnunetnamestore.la \
+        -ljansson
+
+
+test_w3c_ed25519_2020_SOURCES = \
+  test_w3c_ed25519_2020.c
+test_w3c_ed25519_2020_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la
+
 check_SCRIPTS = \
   test_reclaim_attribute.sh \
   test_reclaim_issue.sh \
   test_reclaim_consume.sh
 
 check_PROGRAMS = \
-  test_reclaim_attribute
+  test_reclaim_attribute \
+  test_w3c_ed25519_2020
 
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/did/gnunet-did.c b/src/reclaim/gnunet-did.c
index 2ebef7601..2ebef7601 100644
--- a/src/did/gnunet-did.c
+++ b/src/reclaim/gnunet-did.c
diff --git a/src/did/test_w3c_ed25519_2020.c b/src/reclaim/test_w3c_ed25519_2020.c
index e2534e6ab..e2534e6ab 100644
--- a/src/did/test_w3c_ed25519_2020.c
+++ b/src/reclaim/test_w3c_ed25519_2020.c