-finishing split of namestore into namestore and namecache (#3065) -- in theory; in practice, somehow something broke badly, so the tests are now failing

2 files changed, 4 insertions, 4 deletions

diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index 7464a9a9f..8bb0627dd 100644
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -4,7 +4,7 @@ USER_SERVICE = YES
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
-@UNIXONLY@ PORT = 2099
+@UNIXONLY@ PORT = 2113
 HOSTNAME = localhost
 BINARY = gnunet-service-namecache
 ACCEPT_FROM = 127.0.0.1;
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 942272b99..f3e78061d 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -31,7 +31,7 @@
 #include "gnunet_crypto_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_dnsparser_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_signatures.h"
 #include "gnunet_namecache_service.h"
 #include "gnunet_namestore_service.h"
@@ -76,7 +76,7 @@ struct GNUNET_NAMECACHE_QueueEntry
   /**
    * Function to call with the blocks we get back; or NULL.
    */
-  GNUNET_GNSRECORD_BlockProcessor block_proc;
+  GNUNET_NAMECACHE_BlockProcessor block_proc;
 
   /**
    * Closure for @e block_proc.
@@ -683,7 +683,7 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
 struct GNUNET_NAMECACHE_QueueEntry *
 GNUNET_NAMECACHE_lookup_block (struct GNUNET_NAMECACHE_Handle *h,
                                const struct GNUNET_HashCode *derived_hash,
-                               GNUNET_GNSRECORD_BlockProcessor proc, void *proc_cls)
+                               GNUNET_NAMECACHE_BlockProcessor proc, void *proc_cls)
 {
   struct GNUNET_NAMECACHE_QueueEntry *qe;
   struct PendingMessage *pe;