hs-v2: Removal of service and relay support

This is unfortunately massive but both functionalities were extremely
intertwined and it would have required us to actually change the HSv2 code in
order to be able to split this into multiple commits.

After this commit, there are still artefacts of v2 in the code but there is no
more support for service, intro point and HSDir.

The v2 support for rendezvous circuit is still available since that code is
the same for the v3 and we will leave it in so if a client is able to
rendezvous on v2 then it can still transfer traffic. Once the entire network
has moved away from v2, we can remove v2 rendezvous point support.

Related to #40266

Signed-off-by: David Goulet <dgoulet@torproject.org>

22 files changed, 32 insertions, 4088 deletions

diff --git a/src/test/fuzz/fuzz_hsdescv2.c b/src/test/fuzz/fuzz_hsdescv2.c
deleted file mode 100644
index 81d9e5f00e..0000000000
--- a/src/test/fuzz/fuzz_hsdescv2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (c) 2016-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-#include "core/or/or.h"
-#include "feature/dirparse/unparseable.h"
-#include "feature/rend/rendcommon.h"
-#include "feature/rend/rendparse.h"
-#include "lib/crypt_ops/crypto_ed25519.h"
-#include "test/fuzz/fuzzing.h"
-
-static void
-mock_dump_desc__nodump(const char *desc, const char *type)
-{
-  (void)desc;
-  (void)type;
-}
-
-int
-fuzz_init(void)
-{
-  disable_signature_checking();
-  MOCK(dump_desc, mock_dump_desc__nodump);
-  ed25519_init();
-  return 0;
-}
-
-int
-fuzz_cleanup(void)
-{
-  return 0;
-}
-
-int
-fuzz_main(const uint8_t *data, size_t sz)
-{
-  rend_service_descriptor_t *desc = NULL;
-  char desc_id[64];
-  char *ipts = NULL;
-  size_t ipts_size, esize;
-  const char *next;
-  char *str = tor_memdup_nulterm(data, sz);
-  (void) rend_parse_v2_service_descriptor(&desc, desc_id, &ipts, &ipts_size,
-                                          &esize, &next, str, 1);
-  if (desc) {
-    log_debug(LD_GENERAL, "Parsing okay");
-    rend_service_descriptor_free(desc);
-  } else {
-    log_debug(LD_GENERAL, "Parsing failed");
-  }
-  tor_free(ipts);
-  tor_free(str);
-  return 0;
-}
diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am
index ef952c3812..9bdced9e6f 100644
--- a/src/test/fuzz/include.am
+++ b/src/test/fuzz/include.am
@@ -84,16 +84,6 @@ src_test_fuzz_fuzz_extrainfo_LDADD = $(FUZZING_LIBS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_fuzz_hsdescv2_SOURCES = \
-	src/test/fuzz/fuzzing_common.c \
-	src/test/fuzz/fuzz_hsdescv2.c
-src_test_fuzz_fuzz_hsdescv2_CPPFLAGS = $(FUZZING_CPPFLAGS)
-src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS)
-src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG)
-src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_hsdescv3_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_hsdescv3.c
@@ -124,16 +114,6 @@ src_test_fuzz_fuzz_http_connect_LDADD = $(FUZZING_LIBS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_fuzz_iptsv2_SOURCES = \
-	src/test/fuzz/fuzzing_common.c \
-	src/test/fuzz/fuzz_iptsv2.c
-src_test_fuzz_fuzz_iptsv2_CPPFLAGS = $(FUZZING_CPPFLAGS)
-src_test_fuzz_fuzz_iptsv2_CFLAGS = $(FUZZING_CFLAGS)
-src_test_fuzz_fuzz_iptsv2_LDFLAGS = $(FUZZING_LDFLAG)
-src_test_fuzz_fuzz_iptsv2_LDADD = $(FUZZING_LIBS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_fuzz_microdesc_SOURCES = \
 	src/test/fuzz/fuzzing_common.c \
 	src/test/fuzz/fuzz_microdesc.c
@@ -180,11 +160,9 @@ FUZZERS = \
 	src/test/fuzz/fuzz-diff \
 	src/test/fuzz/fuzz-diff-apply \
 	src/test/fuzz/fuzz-extrainfo \
-	src/test/fuzz/fuzz-hsdescv2 \
 	src/test/fuzz/fuzz-hsdescv3 \
 	src/test/fuzz/fuzz-http \
 	src/test/fuzz/fuzz-http-connect \
-	src/test/fuzz/fuzz-iptsv2 \
 	src/test/fuzz/fuzz-microdesc \
 	src/test/fuzz/fuzz-socks \
 	src/test/fuzz/fuzz-strops \
@@ -240,15 +218,6 @@ src_test_fuzz_lf_fuzz_extrainfo_LDADD = $(LIBFUZZER_LIBS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_lf_fuzz_hsdescv2_SOURCES = \
-	$(src_test_fuzz_fuzz_hsdescv2_SOURCES)
-src_test_fuzz_lf_fuzz_hsdescv2_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
-src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS)
-src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
-src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv3_SOURCES)
 src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -276,15 +245,6 @@ src_test_fuzz_lf_fuzz_http_connect_LDADD = $(LIBFUZZER_LIBS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_lf_fuzz_iptsv2_SOURCES = \
-	$(src_test_fuzz_fuzz_iptsv2_SOURCES)
-src_test_fuzz_lf_fuzz_iptsv2_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
-src_test_fuzz_lf_fuzz_iptsv2_CFLAGS = $(LIBFUZZER_CFLAGS)
-src_test_fuzz_lf_fuzz_iptsv2_LDFLAGS = $(LIBFUZZER_LDFLAG)
-src_test_fuzz_lf_fuzz_iptsv2_LDADD = $(LIBFUZZER_LIBS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_lf_fuzz_microdesc_SOURCES = \
 	$(src_test_fuzz_fuzz_microdesc_SOURCES)
 src_test_fuzz_lf_fuzz_microdesc_CPPFLAGS = $(LIBFUZZER_CPPFLAGS)
@@ -326,11 +286,9 @@ LIBFUZZER_FUZZERS = \
 	src/test/fuzz/lf-fuzz-diff \
 	src/test/fuzz/lf-fuzz-diff-apply \
 	src/test/fuzz/lf-fuzz-extrainfo \
-	src/test/fuzz/lf-fuzz-hsdescv2 \
 	src/test/fuzz/lf-fuzz-hsdescv3 \
 	src/test/fuzz/lf-fuzz-http \
 	src/test/fuzz/lf-fuzz-http-connect \
-	src/test/fuzz/lf-fuzz-iptsv2 \
 	src/test/fuzz/lf-fuzz-microdesc \
 	src/test/fuzz/lf-fuzz-socks \
 	src/test/fuzz/lf-fuzz-strops \
@@ -379,13 +337,6 @@ src_test_fuzz_liboss_fuzz_extrainfo_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \
-	$(src_test_fuzz_fuzz_hsdescv2_SOURCES)
-src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
-src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \
 	$(src_test_fuzz_fuzz_hsdescv3_SOURCES)
 src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -407,13 +358,6 @@ src_test_fuzz_liboss_fuzz_http_connect_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
 endif
 
 if UNITTESTS_ENABLED
-src_test_fuzz_liboss_fuzz_iptsv2_a_SOURCES = \
-	$(src_test_fuzz_fuzz_iptsv2_SOURCES)
-src_test_fuzz_liboss_fuzz_iptsv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
-src_test_fuzz_liboss_fuzz_iptsv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS)
-endif
-
-if UNITTESTS_ENABLED
 src_test_fuzz_liboss_fuzz_microdesc_a_SOURCES = \
 	$(src_test_fuzz_fuzz_microdesc_SOURCES)
 src_test_fuzz_liboss_fuzz_microdesc_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS)
@@ -447,11 +391,9 @@ OSS_FUZZ_FUZZERS = \
 	src/test/fuzz/liboss-fuzz-diff.a \
 	src/test/fuzz/liboss-fuzz-diff-apply.a \
 	src/test/fuzz/liboss-fuzz-extrainfo.a \
-	src/test/fuzz/liboss-fuzz-hsdescv2.a \
 	src/test/fuzz/liboss-fuzz-hsdescv3.a \
 	src/test/fuzz/liboss-fuzz-http.a \
 	src/test/fuzz/liboss-fuzz-http-connect.a \
-	src/test/fuzz/liboss-fuzz-iptsv2.a \
 	src/test/fuzz/liboss-fuzz-microdesc.a \
 	src/test/fuzz/liboss-fuzz-socks.a \
 	src/test/fuzz/liboss-fuzz-strops.a \
diff --git a/src/test/include.am b/src/test/include.am
index cdf3b20c48..9372b796f8 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -130,7 +130,6 @@ src_test_test_SOURCES += \
 	src/test/log_test_helpers.c \
 	src/test/hs_test_helpers.c \
 	src/test/opts_test_helpers.c \
-	src/test/rend_test_helpers.c \
 	src/test/resolve_test_helpers.c \
 	src/test/rng_test_helpers.c \
 	src/test/test.c \
@@ -181,7 +180,6 @@ src_test_test_SOURCES += \
 	src/test/test_geoip.c \
 	src/test/test_guardfraction.c \
 	src/test/test_extorport.c \
-	src/test/test_hs.c \
 	src/test/test_hs_common.c \
 	src/test/test_hs_config.c \
 	src/test/test_hs_cell.c \
@@ -196,7 +194,6 @@ src_test_test_SOURCES += \
 	src/test/test_hs_descriptor.c \
 	src/test/test_hs_dos.c \
 	src/test/test_hs_metrics.c \
-	src/test/test_introduce.c \
 	src/test/test_keypin.c \
 	src/test/test_link_handshake.c \
 	src/test/test_logging.c \
@@ -227,7 +224,6 @@ src_test_test_SOURCES += \
 	src/test/test_relay.c \
 	src/test/test_relaycell.c \
 	src/test/test_relaycrypt.c \
-	src/test/test_rendcache.c \
 	src/test/test_replay.c \
 	src/test/test_router.c \
 	src/test/test_routerkeys.c \
@@ -380,7 +376,6 @@ noinst_HEADERS+= \
 	src/test/hs_test_helpers.h \
 	src/test/log_test_helpers.h \
 	src/test/opts_test_helpers.h \
-	src/test/rend_test_helpers.h \
 	src/test/resolve_test_helpers.h \
 	src/test/rng_test_helpers.h \
 	src/test/test.h \
diff --git a/src/test/rend_test_helpers.c b/src/test/rend_test_helpers.c
deleted file mode 100644
index 8e40167aeb..0000000000
--- a/src/test/rend_test_helpers.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright (c) 2014-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#include "core/or/or.h"
-#include "core/or/extendinfo.h"
-#include "lib/crypt_ops/crypto_rand.h"
-#include "test/test.h"
-#include "feature/rend/rendcommon.h"
-#include "test/rend_test_helpers.h"
-
-#include "core/or/extend_info_st.h"
-#include "feature/rend/rend_intro_point_st.h"
-#include "feature/rend/rend_service_descriptor_st.h"
-
-void
-generate_desc(int time_diff, rend_encoded_v2_service_descriptor_t **desc,
-              char **service_id, int intro_points)
-{
-  rend_service_descriptor_t *generated = NULL;
-  smartlist_t *descs = smartlist_new();
-  time_t now;
-
-  now = time(NULL) + time_diff;
-  create_descriptor(&generated, service_id, intro_points);
-  generated->timestamp = now;
-
-  rend_encode_v2_descriptors(descs, generated, now, 0, REND_NO_AUTH, NULL,
-                             NULL);
-  tor_assert(smartlist_len(descs) > 1);
-  *desc = smartlist_get(descs, 0);
-  smartlist_set(descs, 0, NULL);
-
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  rend_service_descriptor_free(generated);
-}
-
-void
-create_descriptor(rend_service_descriptor_t **generated, char **service_id,
-                  int intro_points)
-{
-  crypto_pk_t *pk1 = NULL;
-  crypto_pk_t *pk2 = NULL;
-  int i;
-
-  *service_id = tor_malloc(REND_SERVICE_ID_LEN_BASE32+1);
-  pk1 = pk_generate(0);
-  pk2 = pk_generate(1);
-
-  *generated = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  (*generated)->pk = crypto_pk_dup_key(pk1);
-  rend_get_service_id((*generated)->pk, *service_id);
-
-  (*generated)->version = 2;
-  (*generated)->protocols = 42;
-  (*generated)->intro_nodes = smartlist_new();
-
-  for (i = 0; i < intro_points; i++) {
-    rend_intro_point_t *intro = tor_malloc_zero(sizeof(rend_intro_point_t));
-    crypto_pk_t *okey = pk_generate(2 + i);
-    intro->extend_info =
-      extend_info_new(NULL, NULL, NULL, NULL, NULL, NULL, 0);
-    intro->extend_info->onion_key = okey;
-    crypto_pk_get_digest(intro->extend_info->onion_key,
-                         intro->extend_info->identity_digest);
-    intro->extend_info->nickname[0] = '$';
-    base16_encode(intro->extend_info->nickname + 1,
-                  sizeof(intro->extend_info->nickname) - 1,
-                  intro->extend_info->identity_digest, DIGEST_LEN);
-    tor_addr_t addr;
-    uint16_t port;
-    /* Does not cover all IP addresses. */
-    tor_addr_from_ipv4h(&addr, crypto_rand_int(65536) + 1);
-    port = 1 + crypto_rand_int(65535);
-    extend_info_add_orport(intro->extend_info, &addr, port);
-    intro->intro_key = crypto_pk_dup_key(pk2);
-    smartlist_add((*generated)->intro_nodes, intro);
-  }
-
-  crypto_pk_free(pk1);
-  crypto_pk_free(pk2);
-}
-
-rend_data_t *
-mock_rend_data(const char *onion_address)
-{
-  rend_data_v2_t *v2_data = tor_malloc_zero(sizeof(*v2_data));
-  rend_data_t *rend_query = &v2_data->base_;
-  rend_query->version = 2;
-
-  strlcpy(v2_data->onion_address, onion_address,
-          sizeof(v2_data->onion_address));
-  v2_data->auth_type = REND_NO_AUTH;
-  rend_query->hsdirs_fp = smartlist_new();
-  smartlist_add(rend_query->hsdirs_fp, tor_memdup("aaaaaaaaaaaaaaaaaaaaaaaa",
-                                                 DIGEST_LEN));
-  return rend_query;
-}
diff --git a/src/test/rend_test_helpers.h b/src/test/rend_test_helpers.h
deleted file mode 100644
index b1078ce866..0000000000
--- a/src/test/rend_test_helpers.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright (c) 2014-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#include "core/or/or.h"
-
-#ifndef TOR_REND_TEST_HELPERS_H
-#define TOR_REND_TEST_HELPERS_H
-
-void generate_desc(int time_diff, rend_encoded_v2_service_descriptor_t **desc,
-                   char **service_id, int intro_points);
-void create_descriptor(rend_service_descriptor_t **generated,
-                       char **service_id, int intro_points);
-rend_data_t *mock_rend_data(const char *onion_address);
-
-#endif /* !defined(TOR_REND_TEST_HELPERS_H) */
-
diff --git a/src/test/test.c b/src/test/test.c
index 0d6c0a0d4a..fd9ce230ea 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -45,9 +45,6 @@
 #include "app/config/config.h"
 #include "core/or/connection_edge.h"
 #include "core/or/extendinfo.h"
-#include "feature/rend/rendcommon.h"
-#include "feature/rend/rendcache.h"
-#include "feature/rend/rendparse.h"
 #include "test/test.h"
 #include "core/mainloop/mainloop.h"
 #include "lib/memarea/memarea.h"
@@ -62,9 +59,6 @@
 
 #include "core/or/extend_info_st.h"
 #include "core/or/or_circuit_st.h"
-#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
-#include "feature/rend/rend_intro_point_st.h"
-#include "feature/rend/rend_service_descriptor_st.h"
 #include "feature/relay/onion_queue.h"
 
 /** Run unit tests for the onion handshake code. */
@@ -619,127 +613,6 @@ test_circuit_timeout(void *arg)
   testing_disable_deterministic_rng();
 }
 
-/** Test encoding and parsing of rendezvous service descriptors. */
-static void
-test_rend_fns(void *arg)
-{
-  rend_service_descriptor_t *generated = NULL, *parsed = NULL;
-  char service_id[DIGEST_LEN];
-  char service_id_base32[REND_SERVICE_ID_LEN_BASE32+1];
-  const char *next_desc;
-  smartlist_t *descs = smartlist_new();
-  char computed_desc_id[DIGEST_LEN];
-  char parsed_desc_id[DIGEST_LEN];
-  crypto_pk_t *pk1 = NULL, *pk2 = NULL;
-  time_t now;
-  char *intro_points_encrypted = NULL;
-  size_t intro_points_size;
-  size_t encoded_size;
-  int i;
-
-  (void)arg;
-
-  /* Initialize the service cache. */
-  rend_cache_init();
-
-  pk1 = pk_generate(0);
-  pk2 = pk_generate(1);
-  generated = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  generated->pk = crypto_pk_dup_key(pk1);
-  crypto_pk_get_digest(generated->pk, service_id);
-  base32_encode(service_id_base32, REND_SERVICE_ID_LEN_BASE32+1,
-                service_id, REND_SERVICE_ID_LEN);
-  now = time(NULL);
-  generated->timestamp = now;
-  generated->version = 2;
-  generated->protocols = 42;
-  generated->intro_nodes = smartlist_new();
-
-  for (i = 0; i < 3; i++) {
-    rend_intro_point_t *intro = tor_malloc_zero(sizeof(rend_intro_point_t));
-    crypto_pk_t *okey = pk_generate(2 + i);
-    intro->extend_info =
-      extend_info_new(NULL, NULL, NULL, NULL, NULL, NULL, 0);
-    intro->extend_info->onion_key = okey;
-    crypto_pk_get_digest(intro->extend_info->onion_key,
-                         intro->extend_info->identity_digest);
-    //crypto_rand(info->identity_digest, DIGEST_LEN); /* Would this work? */
-    intro->extend_info->nickname[0] = '$';
-    base16_encode(intro->extend_info->nickname + 1,
-                  sizeof(intro->extend_info->nickname) - 1,
-                  intro->extend_info->identity_digest, DIGEST_LEN);
-    tor_addr_t addr;
-    uint16_t port;
-    /* Does not cover all IP addresses. */
-    tor_addr_from_ipv4h(&addr, crypto_rand_int(65536) + 1);
-    port = 1 + crypto_rand_int(65535);
-    extend_info_add_orport(intro->extend_info, &addr, port);
-    intro->intro_key = crypto_pk_dup_key(pk2);
-    smartlist_add(generated->intro_nodes, intro);
-  }
-  int rv = rend_encode_v2_descriptors(descs, generated, now, 0,
-                                      REND_NO_AUTH, NULL, NULL);
-  tt_int_op(rv, OP_GT, 0);
-  rv = rend_compute_v2_desc_id(computed_desc_id, service_id_base32, NULL,
-                               now, 0);
-  tt_int_op(rv, OP_EQ, 0);
-  tt_mem_op(((rend_encoded_v2_service_descriptor_t *)
-             smartlist_get(descs, 0))->desc_id, OP_EQ,
-            computed_desc_id, DIGEST_LEN);
-  rv = rend_parse_v2_service_descriptor(&parsed, parsed_desc_id,
-               &intro_points_encrypted, &intro_points_size, &encoded_size,
-               &next_desc,
-          ((rend_encoded_v2_service_descriptor_t *)smartlist_get(descs, 0))
-                                        ->desc_str, 1);
-  tt_int_op(rv, OP_EQ, 0);
-  tt_assert(parsed);
-  tt_mem_op(((rend_encoded_v2_service_descriptor_t *)
-         smartlist_get(descs, 0))->desc_id,OP_EQ, parsed_desc_id, DIGEST_LEN);
-  tt_int_op(rend_parse_introduction_points(parsed, intro_points_encrypted,
-                                         intro_points_size),OP_EQ, 3);
-  tt_assert(!crypto_pk_cmp_keys(generated->pk, parsed->pk));
-  tt_int_op(parsed->timestamp,OP_EQ, now);
-  tt_int_op(parsed->version,OP_EQ, 2);
-  tt_int_op(parsed->protocols,OP_EQ, 42);
-  tt_int_op(smartlist_len(parsed->intro_nodes),OP_EQ, 3);
-  for (i = 0; i < smartlist_len(parsed->intro_nodes); i++) {
-    rend_intro_point_t *par_intro = smartlist_get(parsed->intro_nodes, i),
-      *gen_intro = smartlist_get(generated->intro_nodes, i);
-    extend_info_t *par_info = par_intro->extend_info;
-    extend_info_t *gen_info = gen_intro->extend_info;
-    tt_assert(!crypto_pk_cmp_keys(gen_info->onion_key, par_info->onion_key));
-    tt_mem_op(gen_info->identity_digest,OP_EQ, par_info->identity_digest,
-               DIGEST_LEN);
-    tt_str_op(gen_info->nickname,OP_EQ, par_info->nickname);
-    const tor_addr_port_t *a1, *a2;
-    a1 = extend_info_get_orport(gen_info, AF_INET);
-    a2 = extend_info_get_orport(par_info, AF_INET);
-    tt_assert(a1 && a2);
-    tt_assert(tor_addr_eq(&a1->addr, &a2->addr));
-    tt_int_op(a2->port,OP_EQ, a2->port);
-  }
-
-  rend_service_descriptor_free(parsed);
-  rend_service_descriptor_free(generated);
-  parsed = generated = NULL;
-
- done:
-  if (descs) {
-    for (i = 0; i < smartlist_len(descs); i++)
-      rend_encoded_v2_service_descriptor_free_(smartlist_get(descs, i));
-    smartlist_free(descs);
-  }
-  if (parsed)
-    rend_service_descriptor_free(parsed);
-  if (generated)
-    rend_service_descriptor_free(generated);
-  if (pk1)
-    crypto_pk_free(pk1);
-  if (pk2)
-    crypto_pk_free(pk2);
-  tor_free(intro_points_encrypted);
-}
-
 #define ENT(name)                                                       \
   { #name, test_ ## name , 0, NULL, NULL }
 #define FORK(name)                                                      \
@@ -753,7 +626,6 @@ static struct testcase_t test_array[] = {
   { "fast_handshake", test_fast_handshake, 0, NULL, NULL },
   FORK(circuit_timeout),
   FORK(circuit_timeout_xm_alpha),
-  FORK(rend_fns),
 
   END_OF_TESTCASES
 };
@@ -828,9 +700,7 @@ struct testgroup_t testgroups[] = {
   { "hs_ntor/", hs_ntor_tests },
   { "hs_ob/", hs_ob_tests },
   { "hs_service/", hs_service_tests },
-  { "introduce/", introduce_tests },
   { "keypin/", keypin_tests },
-  { "legacy_hs/", hs_tests },
   { "link-handshake/", link_handshake_tests },
   { "mainloop/", mainloop_tests },
   { "metrics/", metrics_tests },
@@ -856,7 +726,6 @@ struct testgroup_t testgroups[] = {
   { "relay/" , relay_tests },
   { "relaycell/", relaycell_tests },
   { "relaycrypt/", relaycrypt_tests },
-  { "rend_cache/", rend_cache_tests },
   { "replaycache/", replaycache_tests },
   { "router/", router_tests },
   { "routerkeys/", routerkeys_tests },
diff --git a/src/test/test.h b/src/test/test.h
index 56037648d3..bdbbe25cb9 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -145,8 +145,6 @@ extern struct testcase_t hs_metrics_tests[];
 extern struct testcase_t hs_ntor_tests[];
 extern struct testcase_t hs_ob_tests[];
 extern struct testcase_t hs_service_tests[];
-extern struct testcase_t hs_tests[];
-extern struct testcase_t introduce_tests[];
 extern struct testcase_t keypin_tests[];
 extern struct testcase_t link_handshake_tests[];
 extern struct testcase_t logging_tests[];
@@ -179,7 +177,6 @@ extern struct testcase_t pubsub_msg_tests[];
 extern struct testcase_t relay_tests[];
 extern struct testcase_t relaycell_tests[];
 extern struct testcase_t relaycrypt_tests[];
-extern struct testcase_t rend_cache_tests[];
 extern struct testcase_t replaycache_tests[];
 extern struct testcase_t router_tests[];
 extern struct testcase_t routerkeys_tests[];
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 5bca3e04fc..710336cb28 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -41,7 +41,6 @@
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
 #include "core/or/policies.h"
-#include "feature/rend/rendservice.h"
 #include "feature/relay/relay_find_addr.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
diff --git a/src/test/test_connection.c b/src/test/test_connection.c
index cf5626ead7..2ebe9afbe2 100644
--- a/src/test/test_connection.c
+++ b/src/test/test_connection.c
@@ -19,7 +19,6 @@
 #include "feature/nodelist/microdesc.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/nodelist/networkstatus.h"
-#include "feature/rend/rendcache.h"
 #include "feature/dircommon/directory.h"
 #include "core/or/connection_or.h"
 #include "lib/net/resolve.h"
@@ -38,10 +37,6 @@ static void * test_conn_get_basic_setup(const struct testcase_t *tc);
 static int test_conn_get_basic_teardown(const struct testcase_t *tc,
                                         void *arg);
 
-static void * test_conn_get_rend_setup(const struct testcase_t *tc);
-static int test_conn_get_rend_teardown(const struct testcase_t *tc,
-                                        void *arg);
-
 static void * test_conn_get_rsrc_setup(const struct testcase_t *tc);
 static int test_conn_get_rsrc_teardown(const struct testcase_t *tc,
                                         void *arg);
@@ -179,52 +174,6 @@ test_conn_get_basic_teardown(const struct testcase_t *tc, void *arg)
   return 0;
 }
 
-static void *
-test_conn_get_rend_setup(const struct testcase_t *tc)
-{
-  dir_connection_t *conn = DOWNCAST(dir_connection_t,
-                                    test_conn_get_connection(
-                                                    TEST_CONN_STATE,
-                                                    TEST_CONN_TYPE,
-                                                    TEST_CONN_REND_PURPOSE));
-  tt_assert(conn);
-  assert_connection_ok(&conn->base_, time(NULL));
-
-  rend_cache_init();
-
-  /* TODO: use directory_initiate_request() to do this - maybe? */
-  tor_assert(strlen(TEST_CONN_REND_ADDR) == REND_SERVICE_ID_LEN_BASE32);
-  conn->rend_data = rend_data_client_create(TEST_CONN_REND_ADDR, NULL, NULL,
-                                            REND_NO_AUTH);
-  assert_connection_ok(&conn->base_, time(NULL));
-  return conn;
-
-  /* On failure */
- done:
-  test_conn_get_rend_teardown(tc, conn);
-  /* Returning NULL causes the unit test to fail */
-  return NULL;
-}
-
-static int
-test_conn_get_rend_teardown(const struct testcase_t *tc, void *arg)
-{
-  dir_connection_t *conn = DOWNCAST(dir_connection_t, arg);
-  int rv = 0;
-
-  tt_assert(conn);
-  assert_connection_ok(&conn->base_, time(NULL));
-
-  /* avoid a last-ditch attempt to refetch the descriptor */
-  conn->base_.purpose = TEST_CONN_REND_PURPOSE_SUCCESSFUL;
-
-  /* connection_free_() cleans up rend_data */
-  rv = test_conn_get_basic_teardown(tc, arg);
- done:
-  rend_cache_free_all();
-  return rv;
-}
-
 static dir_connection_t *
 test_conn_download_status_add_a_connection(const char *resource)
 {
@@ -369,10 +318,6 @@ static struct testcase_setup_t test_conn_get_basic_st = {
   test_conn_get_basic_setup, test_conn_get_basic_teardown
 };
 
-static struct testcase_setup_t test_conn_get_rend_st = {
-  test_conn_get_rend_setup, test_conn_get_rend_teardown
-};
-
 static struct testcase_setup_t test_conn_get_rsrc_st = {
   test_conn_get_rsrc_setup, test_conn_get_rsrc_teardown
 };
@@ -489,37 +434,6 @@ test_conn_get_basic(void *arg)
   ;
 }
 
-static void
-test_conn_get_rend(void *arg)
-{
-  dir_connection_t *conn = DOWNCAST(dir_connection_t, arg);
-  tt_assert(conn);
-  assert_connection_ok(&conn->base_, time(NULL));
-
-  tt_assert(connection_get_by_type_state_rendquery(
-                                            conn->base_.type,
-                                            conn->base_.state,
-                                            rend_data_get_address(
-                                                      conn->rend_data))
-            == TO_CONN(conn));
-  tt_assert(connection_get_by_type_state_rendquery(
-                                            TEST_CONN_TYPE,
-                                            TEST_CONN_STATE,
-                                            TEST_CONN_REND_ADDR)
-            == TO_CONN(conn));
-  tt_assert(connection_get_by_type_state_rendquery(TEST_CONN_REND_TYPE_2,
-                                                   !conn->base_.state,
-                                                   "")
-            == NULL);
-  tt_assert(connection_get_by_type_state_rendquery(TEST_CONN_REND_TYPE_2,
-                                                   !TEST_CONN_STATE,
-                                                   TEST_CONN_REND_ADDR_2)
-            == NULL);
-
- done:
-  ;
-}
-
 #define sl_is_conn_assert(sl_input, conn) \
   do {                                               \
     the_sl = (sl_input);                             \
@@ -1091,7 +1005,6 @@ static const unsigned int PROXY_HAPROXY_ARG = PROXY_HAPROXY;
 
 struct testcase_t connection_tests[] = {
   CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st),
-  CONNECTION_TESTCASE(get_rend,  TT_FORK, test_conn_get_rend_st),
   CONNECTION_TESTCASE(get_rsrc,  TT_FORK, test_conn_get_rsrc_st),
 
   CONNECTION_TESTCASE_ARG(download_status,  TT_FORK,
diff --git a/src/test/test_controller.c b/src/test/test_controller.c
index 0745651aca..4737a35939 100644
--- a/src/test/test_controller.c
+++ b/src/test/test_controller.c
@@ -16,7 +16,6 @@
 #include "feature/dircache/dirserv.h"
 #include "feature/hs/hs_common.h"
 #include "feature/nodelist/networkstatus.h"
-#include "feature/rend/rendservice.h"
 #include "feature/nodelist/authcert.h"
 #include "feature/nodelist/nodelist.h"
 #include "feature/stats/rephist.h"
@@ -317,110 +316,6 @@ test_add_onion_helper_keyarg_v3(void *arg)
 }
 
 static void
-test_add_onion_helper_keyarg_v2(void *arg)
-{
-  int ret, hs_version;
-  add_onion_secret_key_t pk;
-  crypto_pk_t *pk1 = NULL;
-  const char *key_new_alg = NULL;
-  char *key_new_blob = NULL;
-  char *encoded = NULL;
-  char *arg_str = NULL;
-
-  (void) arg;
-  MOCK(control_write_reply, mock_control_write_reply);
-
-  memset(&pk, 0, sizeof(pk));
-
-  /* Test explicit RSA1024 key generation. */
-  tor_free(reply_str);
-  ret = add_onion_helper_keyarg("NEW:RSA1024", 0, &key_new_alg, &key_new_blob,
-                                &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, 0);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(pk.v2);
-  tt_str_op(key_new_alg, OP_EQ, "RSA1024");
-  tt_assert(key_new_blob);
-  tt_ptr_op(reply_str, OP_EQ, NULL);
-
-  /* Test discarding the private key. */
-  crypto_pk_free(pk.v2); pk.v2 = NULL;
-  tor_free(key_new_blob);
-  ret = add_onion_helper_keyarg("NEW:RSA1024", 1, &key_new_alg, &key_new_blob,
-                               &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, 0);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(pk.v2);
-  tt_ptr_op(key_new_alg, OP_EQ, NULL);
-  tt_ptr_op(key_new_blob, OP_EQ, NULL);
-  tt_ptr_op(reply_str, OP_EQ, NULL);
-
-  /* Test generating a invalid key type. */
-  crypto_pk_free(pk.v2); pk.v2 = NULL;
-  ret = add_onion_helper_keyarg("NEW:RSA512", 0, &key_new_alg, &key_new_blob,
-                               &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(!pk.v2);
-  tt_ptr_op(key_new_alg, OP_EQ, NULL);
-  tt_ptr_op(key_new_blob, OP_EQ, NULL);
-  tt_assert(reply_str);
-
-  /* Test loading a RSA1024 key. */
-  tor_free(reply_str);
-  pk1 = pk_generate(0);
-  tt_int_op(0, OP_EQ, crypto_pk_base64_encode_private(pk1, &encoded));
-  tor_asprintf(&arg_str, "RSA1024:%s", encoded);
-  ret = add_onion_helper_keyarg(arg_str, 0, &key_new_alg, &key_new_blob,
-                                &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, 0);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(pk.v2);
-  tt_ptr_op(key_new_alg, OP_EQ, NULL);
-  tt_ptr_op(key_new_blob, OP_EQ, NULL);
-  tt_ptr_op(reply_str, OP_EQ, NULL);
-  tt_int_op(crypto_pk_cmp_keys(pk1, pk.v2), OP_EQ, 0);
-
-  /* Test loading a invalid key type. */
-  tor_free(arg_str);
-  crypto_pk_free(pk1); pk1 = NULL;
-  crypto_pk_free(pk.v2); pk.v2 = NULL;
-  tor_asprintf(&arg_str, "RSA512:%s", encoded);
-  ret = add_onion_helper_keyarg(arg_str, 0, &key_new_alg, &key_new_blob,
-                                &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(!pk.v2);
-  tt_ptr_op(key_new_alg, OP_EQ, NULL);
-  tt_ptr_op(key_new_blob, OP_EQ, NULL);
-  tt_assert(reply_str);
-
-  /* Test loading a invalid key. */
-  tor_free(arg_str);
-  crypto_pk_free(pk.v2); pk.v2 = NULL;
-  tor_free(reply_str);
-  encoded[strlen(encoded)/2] = '\0';
-  tor_asprintf(&arg_str, "RSA1024:%s", encoded);
-  ret = add_onion_helper_keyarg(arg_str, 0, &key_new_alg, &key_new_blob,
-                               &pk, &hs_version, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  tt_int_op(hs_version, OP_EQ, HS_VERSION_TWO);
-  tt_assert(!pk.v2);
-  tt_ptr_op(key_new_alg, OP_EQ, NULL);
-  tt_ptr_op(key_new_blob, OP_EQ, NULL);
-  tt_assert(reply_str);
-
- done:
-  crypto_pk_free(pk1);
-  crypto_pk_free(pk.v2);
-  tor_free(key_new_blob);
-  tor_free(reply_str);
-  tor_free(encoded);
-  tor_free(arg_str);
-  UNMOCK(control_write_reply);
-}
-
-static void
 test_getinfo_helper_onion(void *arg)
 {
   (void)arg;
@@ -567,58 +462,6 @@ test_hs_parse_port_config(void *arg)
   tor_free(err_msg);
 }
 
-static void
-test_add_onion_helper_clientauth(void *arg)
-{
-  rend_authorized_client_t *client = NULL;
-  int created = 0;
-
-  (void)arg;
-
-  MOCK(control_write_reply, mock_control_write_reply);
-  /* Test "ClientName" only. */
-  tor_free(reply_str);
-  client = add_onion_helper_clientauth("alice", &created, NULL);
-  tt_assert(client);
-  tt_assert(created);
-  tt_ptr_op(reply_str, OP_EQ, NULL);
-  rend_authorized_client_free(client);
-
-  /* Test "ClientName:Blob" */
-  tor_free(reply_str);
-  client = add_onion_helper_clientauth("alice:475hGBHPlq7Mc0cRZitK/B",
-                                       &created, NULL);
-  tt_assert(client);
-  tt_assert(!created);
-  tt_ptr_op(reply_str, OP_EQ, NULL);
-  rend_authorized_client_free(client);
-
-  /* Test invalid client names */
-  tor_free(reply_str);
-  client = add_onion_helper_clientauth("no*asterisks*allowed", &created,
-                                       NULL);
-  tt_ptr_op(client, OP_EQ, NULL);
-  tt_assert(reply_str);
-
-  /* Test invalid auth cookie */
-  tor_free(reply_str);
-  client = add_onion_helper_clientauth("alice:12345", &created, NULL);
-  tt_ptr_op(client, OP_EQ, NULL);
-  tt_assert(reply_str);
-
-  /* Test invalid syntax */
-  tor_free(reply_str);
-  client = add_onion_helper_clientauth(":475hGBHPlq7Mc0cRZitK/B", &created,
-                                       NULL);
-  tt_ptr_op(client, OP_EQ, NULL);
-  tt_assert(reply_str);
-
- done:
-  rend_authorized_client_free(client);
-  tor_free(reply_str);
-  UNMOCK(control_write_reply);
-}
-
 /* Mocks and data/variables used for GETINFO download status tests */
 
 static const download_status_t dl_status_default =
@@ -2209,15 +2052,11 @@ struct testcase_t controller_tests[] = {
   PARSER_TEST(no_args_one_obj),
   PARSER_TEST(no_args_kwargs),
   PARSER_TEST(one_arg_kwargs),
-  { "add_onion_helper_keyarg_v2", test_add_onion_helper_keyarg_v2, 0,
-    NULL, NULL },
   { "add_onion_helper_keyarg_v3", test_add_onion_helper_keyarg_v3, 0,
     NULL, NULL },
   { "getinfo_helper_onion", test_getinfo_helper_onion, 0, NULL, NULL },
   { "hs_parse_port_config", test_hs_parse_port_config, 0,
     NULL, NULL },
-  { "add_onion_helper_clientauth", test_add_onion_helper_clientauth, 0, NULL,
-    NULL },
   { "download_status_consensus", test_download_status_consensus, 0, NULL,
     NULL },
   {"getinfo_helper_current_consensus_from_cache",
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index d62dd3fb9e..bb2bc6ad21 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -4848,9 +4848,6 @@ test_dir_purpose_needs_anonymity_returns_true_for_bridges(void *arg)
   tt_int_op(1, OP_EQ, purpose_needs_anonymity(0, ROUTER_PURPOSE_BRIDGE, NULL));
   tt_int_op(1, OP_EQ, purpose_needs_anonymity(0, ROUTER_PURPOSE_BRIDGE,
                                            "foobar"));
-  tt_int_op(1, OP_EQ,
-            purpose_needs_anonymity(DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2,
-                                    ROUTER_PURPOSE_BRIDGE, NULL));
  done: ;
 }
 
@@ -4865,21 +4862,6 @@ test_dir_purpose_needs_anonymity_returns_false_for_own_bridge_desc(void *arg)
 }
 
 static void
-test_dir_purpose_needs_anonymity_returns_true_for_sensitive_purpose(void *arg)
-{
-  (void)arg;
-
-  tt_int_op(1, OP_EQ, purpose_needs_anonymity(
-                    DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2,
-                    ROUTER_PURPOSE_GENERAL, NULL));
-  tt_int_op(1, OP_EQ, purpose_needs_anonymity(
-                    DIR_PURPOSE_UPLOAD_RENDDESC_V2, 0,  NULL));
-  tt_int_op(1, OP_EQ, purpose_needs_anonymity(
-                    DIR_PURPOSE_FETCH_RENDDESC_V2, 0, NULL));
- done: ;
-}
-
-static void
 test_dir_purpose_needs_anonymity_ret_false_for_non_sensitive_conn(void *arg)
 {
   (void)arg;
@@ -4937,12 +4919,6 @@ test_dir_fetch_type(void *arg)
   tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL,
                            NULL), OP_EQ, MICRODESC_DIRINFO);
 
-  /* This will give a warning, because this function isn't supposed to be
-   * used for HS descriptors. */
-  setup_full_capture_of_logs(LOG_WARN);
-  tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_RENDDESC_V2,
-                           ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, NO_DIRINFO);
-  expect_single_log_msg_containing("Unexpected purpose");
  done:
   teardown_capture_of_logs();
 }
@@ -5300,10 +5276,6 @@ test_dir_conn_purpose_to_string(void *data)
   EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_STATUS_VOTE, "status vote fetch");
   EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES,
                       "consensus signature fetch");
-  EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_RENDDESC_V2,
-                      "hidden-service v2 descriptor fetch");
-  EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_RENDDESC_V2,
-                      "hidden-service v2 descriptor upload");
   EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_MICRODESC, "microdescriptor fetch");
 
   /* This will give a warning, because there is no purpose 1024. */
@@ -7311,7 +7283,6 @@ struct testcase_t dir_tests[] = {
   DIR(purpose_needs_anonymity_returns_true_for_bridges, 0),
   DIR(purpose_needs_anonymity_returns_false_for_own_bridge_desc, 0),
   DIR(purpose_needs_anonymity_returns_true_by_default, 0),
-  DIR(purpose_needs_anonymity_returns_true_for_sensitive_purpose, 0),
   DIR(purpose_needs_anonymity_ret_false_for_non_sensitive_conn, 0),
   DIR(post_parsing, 0),
   DIR(fetch_type, 0),
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index 28f07efbe8..06ab309362 100644
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -18,14 +18,11 @@
 #include "feature/dircache/dircache.h"
 #include "test/test.h"
 #include "lib/compress/compress.h"
-#include "feature/rend/rendcommon.h"
-#include "feature/rend/rendcache.h"
 #include "feature/relay/relay_config.h"
 #include "feature/relay/router.h"
 #include "feature/nodelist/authcert.h"
 #include "feature/nodelist/dirlist.h"
 #include "feature/nodelist/routerlist.h"
-#include "test/rend_test_helpers.h"
 #include "feature/nodelist/microdesc.h"
 #include "test/test_helpers.h"
 #include "feature/nodelist/nodelist.h"
@@ -44,7 +41,6 @@
 #include "feature/dircommon/dir_connection_st.h"
 #include "feature/dirclient/dir_server_st.h"
 #include "feature/nodelist/networkstatus_st.h"
-#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
 #include "feature/nodelist/routerinfo_st.h"
 #include "feature/nodelist/routerlist_st.h"
 
@@ -261,125 +257,6 @@ test_dir_handle_get_robots_txt(void *data)
     tor_free(body);
 }
 
-#define RENDEZVOUS2_GET(descid) GET("/tor/rendezvous2/" descid)
-static void
-test_dir_handle_get_rendezvous2_not_found_if_not_encrypted(void *data)
-{
-  dir_connection_t *conn = NULL;
-  char *header = NULL;
-  (void) data;
-
-  MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock);
-
-  conn = new_dir_conn();
-
-  // connection is not encrypted
-  tt_assert(!connection_dir_is_encrypted(conn));
-
-  tt_int_op(directory_handle_command_get(conn, RENDEZVOUS2_GET(), NULL, 0),
-            OP_EQ, 0);
-  fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE,
-                      NULL, NULL, 1, 0);
-
-  tt_str_op(NOT_FOUND, OP_EQ, header);
-
-  done:
-    UNMOCK(connection_write_to_buf_impl_);
-    connection_free_minimal(TO_CONN(conn));
-    tor_free(header);
-}
-
-static void
-test_dir_handle_get_rendezvous2_on_encrypted_conn_with_invalid_desc_id(
-  void *data)
-{
-  dir_connection_t *conn = NULL;
-  char *header = NULL;
-  (void) data;
-
-  MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock);
-  conn = new_dir_conn();
-
-  // connection is encrypted
-  TO_CONN(conn)->linked = 1;
-  tt_assert(connection_dir_is_encrypted(conn));
-
-  tt_int_op(directory_handle_command_get(conn,
-            RENDEZVOUS2_GET("invalid-desc-id"), NULL, 0), OP_EQ, 0);
-  fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE,
-                      NULL, NULL, 1, 0);
-
-  tt_str_op(header, OP_EQ, BAD_REQUEST);
-
-  done:
-    UNMOCK(connection_write_to_buf_impl_);
-    connection_free_minimal(TO_CONN(conn));
-    tor_free(header);
-}
-
-static void
-test_dir_handle_get_rendezvous2_on_encrypted_conn_not_well_formed(void *data)
-{
-  dir_connection_t *conn = NULL;
-  char *header = NULL;
-  (void) data;
-
-  MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock);
-  conn = new_dir_conn();
-
-  // connection is encrypted
-  TO_CONN(conn)->linked = 1;
-  tt_assert(connection_dir_is_encrypted(conn));
-
-  //TODO: this can't be reached because rend_valid_descriptor_id() prevents
-  //this case to happen. This test is the same as
-  //test_dir_handle_get_rendezvous2_on_encrypted_conn_with_invalid_desc_id We
-  //should refactor to remove the case from the switch.
-
-  const char *req = RENDEZVOUS2_GET("1bababababababababababababababab");
-  tt_int_op(directory_handle_command_get(conn, req, NULL, 0), OP_EQ, 0);
-
-  fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE,
-                      NULL, NULL, 1, 0);
-
-  tt_str_op(header, OP_EQ, BAD_REQUEST);
-
-  done:
-    UNMOCK(connection_write_to_buf_impl_);
-    connection_free_minimal(TO_CONN(conn));
-    tor_free(header);
-}
-
-static void
-test_dir_handle_get_rendezvous2_not_found(void *data)
-{
-  dir_connection_t *conn = NULL;
-  char *header = NULL;
-  (void) data;
-
-  MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock);
-  conn = new_dir_conn();
-
-  rend_cache_init();
-
-  // connection is encrypted
-  TO_CONN(conn)->linked = 1;
-  tt_assert(connection_dir_is_encrypted(conn));
-
-  const char *req = RENDEZVOUS2_GET("3xqunszqnaolrrfmtzgaki7mxelgvkje");
-  tt_int_op(directory_handle_command_get(conn, req, NULL, 0), OP_EQ, 0);
-  fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE,
-                      NULL, NULL, 1, 0);
-
-  tt_str_op(NOT_FOUND, OP_EQ, header);
-
-  done:
-    UNMOCK(connection_write_to_buf_impl_);
-    connection_free_minimal(TO_CONN(conn));
-    tor_free(header);
-    rend_cache_free_all();
-}
-
 static const routerinfo_t * dhg_tests_router_get_my_routerinfo(void);
 ATTR_UNUSED static int dhg_tests_router_get_my_routerinfo_called = 0;
 
@@ -395,76 +272,6 @@ dhg_tests_router_get_my_routerinfo(void)
   return mock_routerinfo;
 }
 
-static void
-test_dir_handle_get_rendezvous2_on_encrypted_conn_success(void *data)
-{
-  dir_connection_t *conn = NULL;
-  char *header = NULL;
-  char *body = NULL;
-  size_t body_used = 0;
-  char buff[30];
-  char req[70];
-  rend_encoded_v2_service_descriptor_t *desc_holder = NULL;
-  char *service_id = NULL;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-  size_t body_len = 0;
-  (void) data;
-
-  MOCK(connection_write_to_buf_impl_, connection_write_to_buf_mock);
-  MOCK(router_get_my_routerinfo,
-       dhg_tests_router_get_my_routerinfo);
-
-  rend_cache_init();
-
-  /* create a valid rend service descriptor */
-  #define RECENT_TIME -10
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-
-  tt_int_op(rend_cache_store_v2_desc_as_dir(desc_holder->desc_str),
-            OP_EQ, 0);
-
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-
-  conn = new_dir_conn();
-
-  // connection is encrypted
-  TO_CONN(conn)->linked = 1;
-  tt_assert(connection_dir_is_encrypted(conn));
-
-  tor_snprintf(req, sizeof(req), RENDEZVOUS2_GET("%s"), desc_id_base32);
-
-  tt_int_op(directory_handle_command_get(conn, req, NULL, 0), OP_EQ, 0);
-
-  body_len = strlen(desc_holder->desc_str);
-  fetch_from_buf_http(TO_CONN(conn)->outbuf, &header, MAX_HEADERS_SIZE,
-                      &body, &body_used, body_len+1, 0);
-
-  tt_assert(header);
-  tt_assert(body);
-
-  tt_ptr_op(strstr(header, "HTTP/1.0 200 OK\r\n"), OP_EQ, header);
-  tt_assert(strstr(header, "Content-Type: text/plain\r\n"));
-  tt_assert(strstr(header, "Content-Encoding: identity\r\n"));
-  tt_assert(strstr(header, "Pragma: no-cache\r\n"));
-  tor_snprintf(buff, sizeof(buff), "Content-Length: %ld\r\n", (long) body_len);
-  tt_assert(strstr(header, buff));
-
-  tt_int_op(body_used, OP_EQ, strlen(body));
-  tt_str_op(body, OP_EQ, desc_holder->desc_str);
-
-  done:
-    UNMOCK(connection_write_to_buf_impl_);
-    UNMOCK(router_get_my_routerinfo);
-
-    connection_free_minimal(TO_CONN(conn));
-    tor_free(header);
-    tor_free(body);
-    rend_encoded_v2_service_descriptor_free(desc_holder);
-    tor_free(service_id);
-    rend_cache_free_all();
-}
-
 #define MICRODESC_GET(digest) GET("/tor/micro/d/" digest)
 static void
 test_dir_handle_get_micro_d_not_found(void *data)
@@ -2934,11 +2741,6 @@ struct testcase_t dir_handle_get_tests[] = {
   DIR_HANDLE_CMD(v1_command_not_found, 0),
   DIR_HANDLE_CMD(v1_command, 0),
   DIR_HANDLE_CMD(robots_txt, 0),
-  DIR_HANDLE_CMD(rendezvous2_not_found_if_not_encrypted, 0),
-  DIR_HANDLE_CMD(rendezvous2_not_found, 0),
-  DIR_HANDLE_CMD(rendezvous2_on_encrypted_conn_with_invalid_desc_id, 0),
-  DIR_HANDLE_CMD(rendezvous2_on_encrypted_conn_not_well_formed, 0),
-  DIR_HANDLE_CMD(rendezvous2_on_encrypted_conn_success, 0),
   DIR_HANDLE_CMD(micro_d_not_found, 0),
   DIR_HANDLE_CMD(micro_d_server_busy, 0),
   DIR_HANDLE_CMD(micro_d, 0),
diff --git a/src/test/test_entryconn.c b/src/test/test_entryconn.c
index 11840b2c4f..d426934882 100644
--- a/src/test/test_entryconn.c
+++ b/src/test/test_entryconn.c
@@ -17,7 +17,6 @@
 #include "feature/nodelist/nodelist.h"
 
 #include "feature/hs/hs_cache.h"
-#include "feature/rend/rendcache.h"
 
 #include "core/or/entry_connection_st.h"
 #include "core/or/socks_request_st.h"
@@ -748,7 +747,6 @@ test_entryconn_rewrite_onion_v3(void *arg)
   /* Make an onion connection using the SOCKS request */
   conn->entry_cfg.onion_traffic = 1;
   ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_SOCKS_WAIT;
-  tt_assert(!ENTRY_TO_EDGE_CONN(conn)->rend_data);
   tt_assert(!ENTRY_TO_EDGE_CONN(conn)->hs_ident);
 
   /* Handle SOCKS and rewrite! */
@@ -763,7 +761,6 @@ test_entryconn_rewrite_onion_v3(void *arg)
             "25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid");
   /* check that HS information got attached to the connection */
   tt_assert(ENTRY_TO_EDGE_CONN(conn)->hs_ident);
-  tt_assert(!ENTRY_TO_EDGE_CONN(conn)->rend_data);
 
  done:
   hs_free_all();
diff --git a/src/test/test_hs.c b/src/test/test_hs.c
deleted file mode 100644
index 42e663330a..0000000000
--- a/src/test/test_hs.c
+++ /dev/null
@@ -1,1003 +0,0 @@
-/* Copyright (c) 2007-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-/**
- * \file test_hs.c
- * \brief Unit tests for hidden service.
- **/
-
-#define CONTROL_EVENTS_PRIVATE
-#define CIRCUITBUILD_PRIVATE
-#define RENDCOMMON_PRIVATE
-#define RENDSERVICE_PRIVATE
-#define HS_SERVICE_PRIVATE
-
-#include "core/or/or.h"
-#include "test/test.h"
-#include "feature/control/control.h"
-#include "feature/control/control_events.h"
-#include "feature/control/control_fmt.h"
-#include "app/config/config.h"
-#include "feature/hs/hs_common.h"
-#include "feature/rend/rendcommon.h"
-#include "feature/rend/rendservice.h"
-#include "feature/nodelist/routerlist.h"
-#include "feature/nodelist/routerset.h"
-#include "core/or/circuitbuild.h"
-
-#include "feature/nodelist/node_st.h"
-#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
-#include "feature/rend/rend_intro_point_st.h"
-#include "feature/nodelist/routerinfo_st.h"
-
-#include "test/test_helpers.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* mock ID digest and longname for node that's in nodelist */
-#define HSDIR_EXIST_ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" \
-                       "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-#define STR_HSDIR_EXIST_LONGNAME \
-                       "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=TestDir"
-/* mock ID digest and longname for node that's not in nodelist */
-#define HSDIR_NONE_EXIST_ID "\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB" \
-                            "\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB\xBB"
-#define STR_HSDIR_NONE_EXIST_LONGNAME \
-                       "$BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-
-/* DuckDuckGo descriptor as an example. This one has extra "\r" at the end so
- * the control port is happy. */
-static const char *hs_desc_content_control = "\
-rendezvous-service-descriptor g5ojobzupf275beh5ra72uyhb3dkpxwg\r\n\
-version 2\r\n\
-permanent-key\r\n\
------BEGIN RSA PUBLIC KEY-----\r\n\
-MIGJAoGBAJ/SzzgrXPxTlFrKVhXh3buCWv2QfcNgncUpDpKouLn3AtPH5Ocys0jE\r\n\
-aZSKdvaiQ62md2gOwj4x61cFNdi05tdQjS+2thHKEm/KsB9BGLSLBNJYY356bupg\r\n\
-I5gQozM65ENelfxYlysBjJ52xSDBd8C4f/p9umdzaaaCmzXG/nhzAgMBAAE=\r\n\
------END RSA PUBLIC KEY-----\r\n\
-secret-id-part anmjoxxwiupreyajjt5yasimfmwcnxlf\r\n\
-publication-time 2015-03-11 19:00:00\r\n\
-protocol-versions 2,3\r\n\
-introduction-points\r\n\
------BEGIN MESSAGE-----\r\n\
-aW50cm9kdWN0aW9uLXBvaW50IDd1bnd4cmg2dG5kNGh6eWt1Z3EzaGZzdHduc2ll\r\n\
-cmhyCmlwLWFkZHJlc3MgMTg4LjEzOC4xMjEuMTE4Cm9uaW9uLXBvcnQgOTAwMQpv\r\n\
-bmlvbi1rZXkKLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JR0pBb0dC\r\n\
-QUxGRVVyeVpDbk9ROEhURmV5cDVjMTRObWVqL1BhekFLTTBxRENTNElKUWh0Y3g1\r\n\
-NXpRSFdOVWIKQ2hHZ0JqR1RjV3ZGRnA0N3FkdGF6WUZhVXE2c0lQKzVqeWZ5b0Q4\r\n\
-UmJ1bzBwQmFWclJjMmNhYUptWWM0RDh6Vgpuby9sZnhzOVVaQnZ1cWY4eHIrMDB2\r\n\
-S0JJNmFSMlA2OE1WeDhrMExqcUpUU2RKOE9idm9yQWdNQkFBRT0KLS0tLS1FTkQg\r\n\
-UlNBIFBVQkxJQyBLRVktLS0tLQpzZXJ2aWNlLWtleQotLS0tLUJFR0lOIFJTQSBQ\r\n\
-VUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JBTnJHb0ozeTlHNXQzN2F2ekI1cTlwN1hG\r\n\
-VUplRUVYMUNOaExnWmJXWGJhVk5OcXpoZFhyL0xTUQppM1Z6dW5OaUs3cndUVnE2\r\n\
-K2QyZ1lRckhMMmIvMXBBY3ZKWjJiNSs0bTRRc0NibFpjRENXTktRbHJnRWN5WXRJ\r\n\
-CkdscXJTbFFEaXA0ZnNrUFMvNDVkWTI0QmJsQ3NGU1k3RzVLVkxJck4zZFpGbmJr\r\n\
-NEZIS1hBZ01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tCmludHJv\r\n\
-ZHVjdGlvbi1wb2ludCBiNGM3enlxNXNheGZzN2prNXFibG1wN3I1b3pwdHRvagpp\r\n\
-cC1hZGRyZXNzIDEwOS4xNjkuNDUuMjI2Cm9uaW9uLXBvcnQgOTAwMQpvbmlvbi1r\r\n\
-ZXkKLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JR0pBb0dCQU8xSXpw\r\n\
-WFFUTUY3RXZUb1NEUXpzVnZiRVFRQUQrcGZ6NzczMVRXZzVaUEJZY1EyUkRaeVp4\r\n\
-OEQKNUVQSU1FeUE1RE83cGd0ak5LaXJvYXJGMC8yempjMkRXTUlSaXZyU29YUWVZ\r\n\
-ZXlMM1pzKzFIajJhMDlCdkYxZAp6MEswblRFdVhoNVR5V3lyMHdsbGI1SFBnTlI0\r\n\
-MS9oYkprZzkwZitPVCtIeGhKL1duUml2QWdNQkFBRT0KLS0tLS1FTkQgUlNBIFBV\r\n\
-QkxJQyBLRVktLS0tLQpzZXJ2aWNlLWtleQotLS0tLUJFR0lOIFJTQSBQVUJMSUMg\r\n\
-S0VZLS0tLS0KTUlHSkFvR0JBSzNWZEJ2ajFtQllLL3JrcHNwcm9Ub0llNUtHVmth\r\n\
-QkxvMW1tK1I2YUVJek1VZFE1SjkwNGtyRwpCd3k5NC8rV0lGNFpGYXh5Z2phejl1\r\n\
-N2pKY1k3ZGJhd1pFeG1hYXFCRlRwL2h2ZG9rcHQ4a1ByRVk4OTJPRHJ1CmJORUox\r\n\
-N1FPSmVMTVZZZk5Kcjl4TWZCQ3JQai8zOGh2RUdrbWVRNmRVWElvbVFNaUJGOVRB\r\n\
-Z01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tCmludHJvZHVjdGlv\r\n\
-bi1wb2ludCBhdjVtcWl0Y2Q3cjJkandsYmN0c2Jlc2R3eGt0ZWtvegppcC1hZGRy\r\n\
-ZXNzIDE0NC43Ni44LjczCm9uaW9uLXBvcnQgNDQzCm9uaW9uLWtleQotLS0tLUJF\r\n\
-R0lOIFJTQSBQVUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JBTzVweVZzQmpZQmNmMXBE\r\n\
-dklHUlpmWXUzQ05nNldka0ZLMGlvdTBXTGZtejZRVDN0NWhzd3cyVwpjejlHMXhx\r\n\
-MmN0Nkd6VWkrNnVkTDlITTRVOUdHTi9BbW8wRG9GV1hKWHpBQkFXd2YyMVdsd1lW\r\n\
-eFJQMHRydi9WCkN6UDkzcHc5OG5vSmdGUGRUZ05iMjdKYmVUZENLVFBrTEtscXFt\r\n\
-b3NveUN2RitRa25vUS9BZ01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0t\r\n\
-LS0tCnNlcnZpY2Uta2V5Ci0tLS0tQkVHSU4gUlNBIFBVQkxJQyBLRVktLS0tLQpN\r\n\
-SUdKQW9HQkFMVjNKSmtWN3lTNU9jc1lHMHNFYzFQOTVRclFRR3ZzbGJ6Wi9zRGxl\r\n\
-RlpKYXFSOUYvYjRUVERNClNGcFMxcU1GbldkZDgxVmRGMEdYRmN2WVpLamRJdHU2\r\n\
-SndBaTRJeEhxeXZtdTRKdUxrcXNaTEFLaXRLVkx4eGsKeERlMjlDNzRWMmJrOTRJ\r\n\
-MEgybTNKS2tzTHVwc3VxWWRVUmhOVXN0SElKZmgyZmNIalF0bEFnTUJBQUU9Ci0t\r\n\
-LS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0KCg==\r\n\
------END MESSAGE-----\r\n\
-signature\r\n\
------BEGIN SIGNATURE-----\r\n\
-d4OuCE5OLAOnRB6cQN6WyMEmg/BHem144Vec+eYgeWoKwx3MxXFplUjFxgnMlmwN\r\n\
-PcftsZf2ztN0sbNCtPgDL3d0PqvxY3iHTQAI8EbaGq/IAJUZ8U4y963dD5+Bn6JQ\r\n\
-myE3ctmh0vy5+QxSiRjmQBkuEpCyks7LvWvHYrhnmcg=\r\n\
------END SIGNATURE-----";
-
-/* DuckDuckGo descriptor as an example. */
-static const char *hs_desc_content = "\
-rendezvous-service-descriptor g5ojobzupf275beh5ra72uyhb3dkpxwg\n\
-version 2\n\
-permanent-key\n\
------BEGIN RSA PUBLIC KEY-----\n\
-MIGJAoGBAJ/SzzgrXPxTlFrKVhXh3buCWv2QfcNgncUpDpKouLn3AtPH5Ocys0jE\n\
-aZSKdvaiQ62md2gOwj4x61cFNdi05tdQjS+2thHKEm/KsB9BGLSLBNJYY356bupg\n\
-I5gQozM65ENelfxYlysBjJ52xSDBd8C4f/p9umdzaaaCmzXG/nhzAgMBAAE=\n\
------END RSA PUBLIC KEY-----\n\
-secret-id-part anmjoxxwiupreyajjt5yasimfmwcnxlf\n\
-publication-time 2015-03-11 19:00:00\n\
-protocol-versions 2,3\n\
-introduction-points\n\
------BEGIN MESSAGE-----\n\
-aW50cm9kdWN0aW9uLXBvaW50IDd1bnd4cmg2dG5kNGh6eWt1Z3EzaGZzdHduc2ll\n\
-cmhyCmlwLWFkZHJlc3MgMTg4LjEzOC4xMjEuMTE4Cm9uaW9uLXBvcnQgOTAwMQpv\n\
-bmlvbi1rZXkKLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JR0pBb0dC\n\
-QUxGRVVyeVpDbk9ROEhURmV5cDVjMTRObWVqL1BhekFLTTBxRENTNElKUWh0Y3g1\n\
-NXpRSFdOVWIKQ2hHZ0JqR1RjV3ZGRnA0N3FkdGF6WUZhVXE2c0lQKzVqeWZ5b0Q4\n\
-UmJ1bzBwQmFWclJjMmNhYUptWWM0RDh6Vgpuby9sZnhzOVVaQnZ1cWY4eHIrMDB2\n\
-S0JJNmFSMlA2OE1WeDhrMExqcUpUU2RKOE9idm9yQWdNQkFBRT0KLS0tLS1FTkQg\n\
-UlNBIFBVQkxJQyBLRVktLS0tLQpzZXJ2aWNlLWtleQotLS0tLUJFR0lOIFJTQSBQ\n\
-VUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JBTnJHb0ozeTlHNXQzN2F2ekI1cTlwN1hG\n\
-VUplRUVYMUNOaExnWmJXWGJhVk5OcXpoZFhyL0xTUQppM1Z6dW5OaUs3cndUVnE2\n\
-K2QyZ1lRckhMMmIvMXBBY3ZKWjJiNSs0bTRRc0NibFpjRENXTktRbHJnRWN5WXRJ\n\
-CkdscXJTbFFEaXA0ZnNrUFMvNDVkWTI0QmJsQ3NGU1k3RzVLVkxJck4zZFpGbmJr\n\
-NEZIS1hBZ01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tCmludHJv\n\
-ZHVjdGlvbi1wb2ludCBiNGM3enlxNXNheGZzN2prNXFibG1wN3I1b3pwdHRvagpp\n\
-cC1hZGRyZXNzIDEwOS4xNjkuNDUuMjI2Cm9uaW9uLXBvcnQgOTAwMQpvbmlvbi1r\n\
-ZXkKLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JR0pBb0dCQU8xSXpw\n\
-WFFUTUY3RXZUb1NEUXpzVnZiRVFRQUQrcGZ6NzczMVRXZzVaUEJZY1EyUkRaeVp4\n\
-OEQKNUVQSU1FeUE1RE83cGd0ak5LaXJvYXJGMC8yempjMkRXTUlSaXZyU29YUWVZ\n\
-ZXlMM1pzKzFIajJhMDlCdkYxZAp6MEswblRFdVhoNVR5V3lyMHdsbGI1SFBnTlI0\n\
-MS9oYkprZzkwZitPVCtIeGhKL1duUml2QWdNQkFBRT0KLS0tLS1FTkQgUlNBIFBV\n\
-QkxJQyBLRVktLS0tLQpzZXJ2aWNlLWtleQotLS0tLUJFR0lOIFJTQSBQVUJMSUMg\n\
-S0VZLS0tLS0KTUlHSkFvR0JBSzNWZEJ2ajFtQllLL3JrcHNwcm9Ub0llNUtHVmth\n\
-QkxvMW1tK1I2YUVJek1VZFE1SjkwNGtyRwpCd3k5NC8rV0lGNFpGYXh5Z2phejl1\n\
-N2pKY1k3ZGJhd1pFeG1hYXFCRlRwL2h2ZG9rcHQ4a1ByRVk4OTJPRHJ1CmJORUox\n\
-N1FPSmVMTVZZZk5Kcjl4TWZCQ3JQai8zOGh2RUdrbWVRNmRVWElvbVFNaUJGOVRB\n\
-Z01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tCmludHJvZHVjdGlv\n\
-bi1wb2ludCBhdjVtcWl0Y2Q3cjJkandsYmN0c2Jlc2R3eGt0ZWtvegppcC1hZGRy\n\
-ZXNzIDE0NC43Ni44LjczCm9uaW9uLXBvcnQgNDQzCm9uaW9uLWtleQotLS0tLUJF\n\
-R0lOIFJTQSBQVUJMSUMgS0VZLS0tLS0KTUlHSkFvR0JBTzVweVZzQmpZQmNmMXBE\n\
-dklHUlpmWXUzQ05nNldka0ZLMGlvdTBXTGZtejZRVDN0NWhzd3cyVwpjejlHMXhx\n\
-MmN0Nkd6VWkrNnVkTDlITTRVOUdHTi9BbW8wRG9GV1hKWHpBQkFXd2YyMVdsd1lW\n\
-eFJQMHRydi9WCkN6UDkzcHc5OG5vSmdGUGRUZ05iMjdKYmVUZENLVFBrTEtscXFt\n\
-b3NveUN2RitRa25vUS9BZ01CQUFFPQotLS0tLUVORCBSU0EgUFVCTElDIEtFWS0t\n\
-LS0tCnNlcnZpY2Uta2V5Ci0tLS0tQkVHSU4gUlNBIFBVQkxJQyBLRVktLS0tLQpN\n\
-SUdKQW9HQkFMVjNKSmtWN3lTNU9jc1lHMHNFYzFQOTVRclFRR3ZzbGJ6Wi9zRGxl\n\
-RlpKYXFSOUYvYjRUVERNClNGcFMxcU1GbldkZDgxVmRGMEdYRmN2WVpLamRJdHU2\n\
-SndBaTRJeEhxeXZtdTRKdUxrcXNaTEFLaXRLVkx4eGsKeERlMjlDNzRWMmJrOTRJ\n\
-MEgybTNKS2tzTHVwc3VxWWRVUmhOVXN0SElKZmgyZmNIalF0bEFnTUJBQUU9Ci0t\n\
-LS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0KCg==\n\
------END MESSAGE-----\n\
-signature\n\
------BEGIN SIGNATURE-----\n\
-d4OuCE5OLAOnRB6cQN6WyMEmg/BHem144Vec+eYgeWoKwx3MxXFplUjFxgnMlmwN\n\
-PcftsZf2ztN0sbNCtPgDL3d0PqvxY3iHTQAI8EbaGq/IAJUZ8U4y963dD5+Bn6JQ\n\
-myE3ctmh0vy5+QxSiRjmQBkuEpCyks7LvWvHYrhnmcg=\n\
------END SIGNATURE-----";
-
-/* Helper global variable for hidden service descriptor event test.
- * It's used as a pointer to dynamically created message buffer in
- * send_control_event_string_replacement function, which mocks
- * send_control_event_string function.
- *
- * Always free it after use! */
-static char *received_msg = NULL;
-
-/** Mock function for send_control_event_string
- */
-static void
-queue_control_event_string_replacement(uint16_t event, char *msg)
-{
-  (void) event;
-  tor_free(received_msg);
-  received_msg = msg;
-}
-
-/** Mock function for node_describe_longname_by_id, it returns either
- * STR_HSDIR_EXIST_LONGNAME or STR_HSDIR_NONE_EXIST_LONGNAME
- */
-static const char *
-node_describe_longname_by_id_replacement(const char *id_digest)
-{
-  if (!strcmp(id_digest, HSDIR_EXIST_ID)) {
-    return STR_HSDIR_EXIST_LONGNAME;
-  } else {
-    return STR_HSDIR_NONE_EXIST_LONGNAME;
-  }
-}
-
-/** Test that we can parse a hardcoded v2 HS desc. */
-static void
-test_hs_parse_static_v2_desc(void *arg)
-{
-  int ret;
-  rend_encoded_v2_service_descriptor_t desc;
-
-  (void) arg;
-
-  /* Test an obviously not parseable string */
-  desc.desc_str = tor_strdup("ceci n'est pas un HS descriptor");
-  ret = rend_desc_v2_is_parsable(&desc);
-  tor_free(desc.desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Test an actual descriptor */
-  desc.desc_str = tor_strdup(hs_desc_content);
-  ret = rend_desc_v2_is_parsable(&desc);
-  tor_free(desc.desc_str);
-  tt_int_op(ret, OP_EQ, 1);
-
- done: ;
-}
-
-/** Make sure each hidden service descriptor async event generation
- *
- * function generates the message in expected format.
- */
-static void
-test_hs_desc_event(void *arg)
-{
-  #define STR_HS_ADDR "ajhb7kljbiru65qo"
-  #define STR_HS_CONTENT_DESC_ID "g5ojobzupf275beh5ra72uyhb3dkpxwg"
-  #define STR_DESC_ID_BASE32 "hba3gmcgpfivzfhx5rtfqkfdhv65yrj3"
-
-  int ret;
-  rend_data_v2_t rend_query;
-  const char *expected_msg;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-
-  (void) arg;
-  MOCK(queue_control_event_string,
-       queue_control_event_string_replacement);
-  MOCK(node_describe_longname_by_id,
-       node_describe_longname_by_id_replacement);
-
-  /* setup rend_query struct */
-  memset(&rend_query, 0, sizeof(rend_query));
-  rend_query.base_.version = 2;
-  strncpy(rend_query.onion_address, STR_HS_ADDR,
-          REND_SERVICE_ID_LEN_BASE32+1);
-  rend_query.auth_type = REND_NO_AUTH;
-  rend_query.base_.hsdirs_fp = smartlist_new();
-  smartlist_add(rend_query.base_.hsdirs_fp, tor_memdup(HSDIR_EXIST_ID,
-                                                       DIGEST_LEN));
-
-  /* Compute descriptor ID for replica 0, should be STR_DESC_ID_BASE32. */
-  ret = rend_compute_v2_desc_id(rend_query.descriptor_id[0],
-                                rend_query.onion_address,
-                                NULL, 0, 0);
-  tt_int_op(ret, OP_EQ, 0);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32),
-                rend_query.descriptor_id[0], DIGEST_LEN);
-  /* Make sure rend_compute_v2_desc_id works properly. */
-  tt_mem_op(desc_id_base32, OP_EQ, STR_DESC_ID_BASE32,
-            sizeof(desc_id_base32));
-
-  /* test request event */
-  control_event_hs_descriptor_requested(rend_query.onion_address,
-                                        rend_query.auth_type, HSDIR_EXIST_ID,
-                                        STR_DESC_ID_BASE32, NULL);
-  expected_msg = "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "\
-                  STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32 "\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* test received event */
-  rend_query.auth_type = REND_BASIC_AUTH;
-  control_event_hsv2_descriptor_received(rend_query.onion_address,
-                                         &rend_query.base_, HSDIR_EXIST_ID);
-  expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\
-                  STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32"\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* test failed event */
-  rend_query.auth_type = REND_STEALTH_AUTH;
-  control_event_hsv2_descriptor_failed(&rend_query.base_,
-                                     HSDIR_NONE_EXIST_ID,
-                                     "QUERY_REJECTED");
-  expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" STEALTH_AUTH "\
-                  STR_HSDIR_NONE_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* test invalid auth type */
-  rend_query.auth_type = 999;
-  control_event_hsv2_descriptor_failed(&rend_query.base_,
-                                     HSDIR_EXIST_ID,
-                                     "QUERY_REJECTED");
-  expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\
-                  STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32\
-                  " REASON=QUERY_REJECTED\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* test no HSDir fingerprint type */
-  rend_query.auth_type = REND_NO_AUTH;
-  control_event_hsv2_descriptor_failed(&rend_query.base_, NULL,
-                                     "QUERY_NO_HSDIR");
-  expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" NO_AUTH " \
-                 "UNKNOWN REASON=QUERY_NO_HSDIR\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* test HSDir rate limited */
-  rend_query.auth_type = REND_NO_AUTH;
-  control_event_hsv2_descriptor_failed(&rend_query.base_, NULL,
-                                     "QUERY_RATE_LIMITED");
-  expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" NO_AUTH " \
-                 "UNKNOWN REASON=QUERY_RATE_LIMITED\r\n";
-  tt_assert(received_msg);
-  tt_str_op(received_msg,OP_EQ, expected_msg);
-  tor_free(received_msg);
-
-  /* Test invalid content with no HSDir fingerprint. */
-  char *exp_msg;
-  control_event_hs_descriptor_content(rend_query.onion_address,
-                                      STR_HS_CONTENT_DESC_ID, NULL, NULL);
-  tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\
-               STR_HS_CONTENT_DESC_ID " UNKNOWN" \
-               "\r\n\r\n.\r\n650 OK\r\n");
-  tt_assert(received_msg);
-  tt_str_op(received_msg, OP_EQ, exp_msg);
-  tor_free(received_msg);
-  tor_free(exp_msg);
-
-  /* test valid content. */
-  control_event_hs_descriptor_content(rend_query.onion_address,
-                                      STR_HS_CONTENT_DESC_ID, HSDIR_EXIST_ID,
-                                      hs_desc_content_control);
-  tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\
-               STR_HS_CONTENT_DESC_ID " " STR_HSDIR_EXIST_LONGNAME\
-               "\r\n%s\r\n.\r\n650 OK\r\n", hs_desc_content_control);
-
-  tt_assert(received_msg);
-  tt_str_op(received_msg, OP_EQ, exp_msg);
-  tor_free(received_msg);
-  tor_free(exp_msg);
-  SMARTLIST_FOREACH(rend_query.base_.hsdirs_fp, char *, d, tor_free(d));
-  smartlist_free(rend_query.base_.hsdirs_fp);
-
- done:
-  UNMOCK(queue_control_event_string);
-  UNMOCK(node_describe_longname_by_id);
-  tor_free(received_msg);
-}
-
-/* Make sure rend_data_t is valid at creation, destruction and when
- * duplicated. */
-static void
-test_hs_rend_data(void *arg)
-{
-  int rep;
-  rend_data_t *client = NULL, *client_dup = NULL;
-  /* Binary format of a descriptor ID. */
-  char desc_id[DIGEST_LEN];
-  char client_cookie[REND_DESC_COOKIE_LEN];
-  time_t now = time(NULL);
-  rend_data_t *service_dup = NULL;
-  rend_data_t *service = NULL;
-
-  (void)arg;
-
-  base32_decode(desc_id, sizeof(desc_id), STR_DESC_ID_BASE32,
-                REND_DESC_ID_V2_LEN_BASE32);
-  memset(client_cookie, 'e', sizeof(client_cookie));
-
-  client = rend_data_client_create(STR_HS_ADDR, desc_id, client_cookie,
-                                   REND_NO_AUTH);
-  tt_assert(client);
-  rend_data_v2_t *client_v2 = TO_REND_DATA_V2(client);
-  tt_int_op(client_v2->auth_type, OP_EQ, REND_NO_AUTH);
-  tt_str_op(client_v2->onion_address, OP_EQ, STR_HS_ADDR);
-  tt_mem_op(client_v2->desc_id_fetch, OP_EQ, desc_id, sizeof(desc_id));
-  tt_mem_op(client_v2->descriptor_cookie, OP_EQ, client_cookie,
-            sizeof(client_cookie));
-  tt_assert(client->hsdirs_fp);
-  tt_int_op(smartlist_len(client->hsdirs_fp), OP_EQ, 0);
-  for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) {
-    int ret = rend_compute_v2_desc_id(desc_id, client_v2->onion_address,
-                                      client_v2->descriptor_cookie, now, rep);
-    /* That shouldn't never fail. */
-    tt_int_op(ret, OP_EQ, 0);
-    tt_mem_op(client_v2->descriptor_id[rep], OP_EQ, desc_id,
-              sizeof(desc_id));
-  }
-  /* The rest should be zeroed because this is a client request. */
-  tt_int_op(tor_digest_is_zero(client_v2->rend_pk_digest), OP_EQ, 1);
-  tt_int_op(tor_digest_is_zero(client->rend_cookie), OP_EQ, 1);
-
-  /* Test dup(). */
-  client_dup = rend_data_dup(client);
-  tt_assert(client_dup);
-  rend_data_v2_t *client_dup_v2 = TO_REND_DATA_V2(client_dup);
-  tt_int_op(client_dup_v2->auth_type, OP_EQ, client_v2->auth_type);
-  tt_str_op(client_dup_v2->onion_address, OP_EQ, client_v2->onion_address);
-  tt_mem_op(client_dup_v2->desc_id_fetch, OP_EQ, client_v2->desc_id_fetch,
-            sizeof(client_dup_v2->desc_id_fetch));
-  tt_mem_op(client_dup_v2->descriptor_cookie, OP_EQ,
-            client_v2->descriptor_cookie,
-            sizeof(client_dup_v2->descriptor_cookie));
-
-  tt_assert(client_dup->hsdirs_fp);
-  tt_int_op(smartlist_len(client_dup->hsdirs_fp), OP_EQ, 0);
-  for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) {
-    tt_mem_op(client_dup_v2->descriptor_id[rep], OP_EQ,
-              client_v2->descriptor_id[rep], DIGEST_LEN);
-  }
-  /* The rest should be zeroed because this is a client request. */
-  tt_int_op(tor_digest_is_zero(client_dup_v2->rend_pk_digest), OP_EQ, 1);
-  tt_int_op(tor_digest_is_zero(client_dup->rend_cookie), OP_EQ, 1);
-  rend_data_free(client);
-  client = NULL;
-  rend_data_free(client_dup);
-  client_dup = NULL;
-
-  /* Reset state. */
-  base32_decode(desc_id, sizeof(desc_id), STR_DESC_ID_BASE32,
-                REND_DESC_ID_V2_LEN_BASE32);
-  memset(client_cookie, 'e', sizeof(client_cookie));
-
-  /* Try with different parameters here for which some content should be
-   * zeroed out. */
-  client = rend_data_client_create(NULL, desc_id, NULL, REND_BASIC_AUTH);
-  tt_assert(client);
-  client_v2 = TO_REND_DATA_V2(client);
-  tt_int_op(client_v2->auth_type, OP_EQ, REND_BASIC_AUTH);
-  tt_int_op(strlen(client_v2->onion_address), OP_EQ, 0);
-  tt_mem_op(client_v2->desc_id_fetch, OP_EQ, desc_id, sizeof(desc_id));
-  tt_int_op(fast_mem_is_zero(client_v2->descriptor_cookie,
-                            sizeof(client_v2->descriptor_cookie)), OP_EQ, 1);
-  tt_assert(client->hsdirs_fp);
-  tt_int_op(smartlist_len(client->hsdirs_fp), OP_EQ, 0);
-  for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) {
-    tt_int_op(tor_digest_is_zero(client_v2->descriptor_id[rep]), OP_EQ, 1);
-  }
-  /* The rest should be zeroed because this is a client request. */
-  tt_int_op(tor_digest_is_zero(client_v2->rend_pk_digest), OP_EQ, 1);
-  tt_int_op(tor_digest_is_zero(client->rend_cookie), OP_EQ, 1);
-  rend_data_free(client);
-  client = NULL;
-
-  /* Let's test the service object now. */
-  char rend_pk_digest[DIGEST_LEN];
-  uint8_t rend_cookie[DIGEST_LEN];
-  memset(rend_pk_digest, 'f', sizeof(rend_pk_digest));
-  memset(rend_cookie, 'g', sizeof(rend_cookie));
-
-  service = rend_data_service_create(STR_HS_ADDR, rend_pk_digest,
-                                     rend_cookie, REND_NO_AUTH);
-  tt_assert(service);
-  rend_data_v2_t *service_v2 = TO_REND_DATA_V2(service);
-  tt_int_op(service_v2->auth_type, OP_EQ, REND_NO_AUTH);
-  tt_str_op(service_v2->onion_address, OP_EQ, STR_HS_ADDR);
-  tt_mem_op(service_v2->rend_pk_digest, OP_EQ, rend_pk_digest,
-            sizeof(rend_pk_digest));
-  tt_mem_op(service->rend_cookie, OP_EQ, rend_cookie, sizeof(rend_cookie));
-  tt_assert(service->hsdirs_fp);
-  tt_int_op(smartlist_len(service->hsdirs_fp), OP_EQ, 0);
-  for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) {
-    tt_int_op(tor_digest_is_zero(service_v2->descriptor_id[rep]), OP_EQ, 1);
-  }
-  /* The rest should be zeroed because this is a service request. */
-  tt_int_op(tor_digest_is_zero(service_v2->descriptor_cookie), OP_EQ, 1);
-  tt_int_op(tor_digest_is_zero(service_v2->desc_id_fetch), OP_EQ, 1);
-
-  /* Test dup(). */
-  service_dup = rend_data_dup(service);
-  rend_data_v2_t *service_dup_v2 = TO_REND_DATA_V2(service_dup);
-  tt_assert(service_dup);
-  tt_int_op(service_dup_v2->auth_type, OP_EQ, service_v2->auth_type);
-  tt_str_op(service_dup_v2->onion_address, OP_EQ, service_v2->onion_address);
-  tt_mem_op(service_dup_v2->rend_pk_digest, OP_EQ, service_v2->rend_pk_digest,
-            sizeof(service_dup_v2->rend_pk_digest));
-  tt_mem_op(service_dup->rend_cookie, OP_EQ, service->rend_cookie,
-            sizeof(service_dup->rend_cookie));
-  tt_assert(service_dup->hsdirs_fp);
-  tt_int_op(smartlist_len(service_dup->hsdirs_fp), OP_EQ, 0);
-  for (rep = 0; rep < REND_NUMBER_OF_NON_CONSECUTIVE_REPLICAS; rep++) {
-    tt_assert(tor_digest_is_zero(service_dup_v2->descriptor_id[rep]));
-  }
-  /* The rest should be zeroed because this is a service request. */
-  tt_int_op(tor_digest_is_zero(service_dup_v2->descriptor_cookie), OP_EQ, 1);
-  tt_int_op(tor_digest_is_zero(service_dup_v2->desc_id_fetch), OP_EQ, 1);
-
- done:
-  rend_data_free(service);
-  rend_data_free(service_dup);
-  rend_data_free(client);
-  rend_data_free(client_dup);
-}
-
-/* Test encoding and decoding service authorization cookies */
-static void
-test_hs_auth_cookies(void *arg)
-{
-#define TEST_COOKIE_RAW ((const uint8_t *) "abcdefghijklmnop")
-#define TEST_COOKIE_ENCODED "YWJjZGVmZ2hpamtsbW5vcA"
-#define TEST_COOKIE_ENCODED_STEALTH "YWJjZGVmZ2hpamtsbW5vcB"
-#define TEST_COOKIE_ENCODED_INVALID "YWJjZGVmZ2hpamtsbW5vcD"
-
-  char *encoded_cookie = NULL;
-  uint8_t raw_cookie[REND_DESC_COOKIE_LEN];
-  rend_auth_type_t auth_type;
-  char *err_msg = NULL;
-  int re;
-
-  (void)arg;
-
-  /* Test that encoding gives the expected result */
-  encoded_cookie = rend_auth_encode_cookie(TEST_COOKIE_RAW, REND_BASIC_AUTH);
-  tt_str_op(encoded_cookie, OP_EQ, TEST_COOKIE_ENCODED);
-  tor_free(encoded_cookie);
-
-  encoded_cookie = rend_auth_encode_cookie(TEST_COOKIE_RAW, REND_STEALTH_AUTH);
-  tt_str_op(encoded_cookie, OP_EQ, TEST_COOKIE_ENCODED_STEALTH);
-  tor_free(encoded_cookie);
-
-  /* Decoding should give the original value */
-  re = rend_auth_decode_cookie(TEST_COOKIE_ENCODED, raw_cookie, &auth_type,
-                               &err_msg);
-  tt_assert(!re);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_mem_op(raw_cookie, OP_EQ, TEST_COOKIE_RAW, REND_DESC_COOKIE_LEN);
-  tt_int_op(auth_type, OP_EQ, REND_BASIC_AUTH);
-  memset(raw_cookie, 0, sizeof(raw_cookie));
-
-  re = rend_auth_decode_cookie(TEST_COOKIE_ENCODED_STEALTH, raw_cookie,
-                               &auth_type, &err_msg);
-  tt_assert(!re);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_mem_op(raw_cookie, OP_EQ, TEST_COOKIE_RAW, REND_DESC_COOKIE_LEN);
-  tt_int_op(auth_type, OP_EQ, REND_STEALTH_AUTH);
-  memset(raw_cookie, 0, sizeof(raw_cookie));
-
-  /* Decoding with padding characters should also work */
-  re = rend_auth_decode_cookie(TEST_COOKIE_ENCODED "==", raw_cookie, NULL,
-                               &err_msg);
-  tt_assert(!re);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_mem_op(raw_cookie, OP_EQ, TEST_COOKIE_RAW, REND_DESC_COOKIE_LEN);
-
-  /* Decoding with an unknown type should fail */
-  re = rend_auth_decode_cookie(TEST_COOKIE_ENCODED_INVALID, raw_cookie,
-                               &auth_type, &err_msg);
-  tt_int_op(re, OP_LT, 0);
-  tt_assert(err_msg);
-  tor_free(err_msg);
-
- done:
-  tor_free(encoded_cookie);
-  tor_free(err_msg);
-
-  return;
-}
-
-static int mock_get_options_calls = 0;
-static or_options_t *mock_options = NULL;
-
-static void
-reset_options(or_options_t *options, int *get_options_calls)
-{
-  memset(options, 0, sizeof(or_options_t));
-  options->TestingTorNetwork = 1;
-
-  *get_options_calls = 0;
-}
-
-static const or_options_t *
-mock_get_options(void)
-{
-  ++mock_get_options_calls;
-  tor_assert(mock_options);
-  return mock_options;
-}
-
-/* arg can't be 0 (the test fails) or 2 (the test is skipped) */
-#define CREATE_HS_DIR_NONE ((intptr_t)0x04)
-#define CREATE_HS_DIR1     ((intptr_t)0x08)
-#define CREATE_HS_DIR2     ((intptr_t)0x10)
-
-/* Test that single onion poisoning works. */
-static void
-test_single_onion_poisoning(void *arg)
-{
-  or_options_t opt;
-  mock_options = &opt;
-  reset_options(mock_options, &mock_get_options_calls);
-  MOCK(get_options, mock_get_options);
-
-  int ret = -1;
-  intptr_t create_dir_mask = (intptr_t)arg;
-  /* Get directories with a random suffix so we can repeat the tests */
-  mock_options->DataDirectory = tor_strdup(get_fname_rnd("test_data_dir"));
-  rend_service_t *service_1 = tor_malloc_zero(sizeof(rend_service_t));
-  char *dir1 = tor_strdup(get_fname_rnd("test_hs_dir1"));
-  rend_service_t *service_2 = tor_malloc_zero(sizeof(rend_service_t));
-  char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
-  smartlist_t *services = smartlist_new();
-  char *poison_path = NULL;
-  char *err_msg = NULL;
-
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-
-  /* Create the data directory, and, if the correct bit in arg is set,
-   * create a directory for that service.
-   * The data directory is required for the lockfile, which is used when
-   * loading keys. */
-  ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL);
-  tt_int_op(ret, OP_EQ, 0);
-  if (create_dir_mask & CREATE_HS_DIR1) {
-    ret = check_private_dir(dir1, CPD_CREATE, NULL);
-    tt_int_op(ret, OP_EQ, 0);
-  }
-  if (create_dir_mask & CREATE_HS_DIR2) {
-    ret = check_private_dir(dir2, CPD_CREATE, NULL);
-    tt_int_op(ret, OP_EQ, 0);
-  }
-
-  service_1->directory = dir1;
-  service_2->directory = dir2;
-  /* The services own the directory pointers now */
-  dir1 = dir2 = NULL;
-  /* Add port to service 1 */
-  service_1->ports = smartlist_new();
-  service_2->ports = smartlist_new();
-  hs_port_config_t *port1 = hs_parse_port_config("80", " ", &err_msg);
-  tt_assert(port1);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  smartlist_add(service_1->ports, port1);
-
-  hs_port_config_t *port2 = hs_parse_port_config("90", " ", &err_msg);
-  /* Add port to service 2 */
-  tt_assert(port2);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  smartlist_add(service_2->ports, port2);
-
-  /* No services, a service to verify, no problem! */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Either way, no problem. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Add the first service */
-  ret = hs_check_service_private_dir(mock_options->User, service_1->directory,
-                                     service_1->dir_group_readable, 1);
-  tt_int_op(ret, OP_EQ, 0);
-  smartlist_add(services, service_1);
-  /* But don't add the second service yet. */
-
-  /* Service directories, but no previous keys, no problem! */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Either way, no problem. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Poison! Poison! Poison!
-   * This can only be done in HiddenServiceSingleHopMode. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_poison_new_single_onion_dir(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  /* Poisoning twice is a no-op. */
-  ret = rend_service_poison_new_single_onion_dir(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Poisoned service directories, but no previous keys, no problem! */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Either way, no problem. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Now add some keys, and we'll have a problem. */
-  ret = rend_service_load_all_keys(services);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Poisoned service directories with previous keys are not allowed. */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_LT, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* But they are allowed if we're in non-anonymous mode. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Re-poisoning directories with existing keys is a no-op, because
-   * directories with existing keys are ignored. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_poison_new_single_onion_dir(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  /* And it keeps the poison. */
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Now add the second service: it has no key and no poison file */
-  ret = hs_check_service_private_dir(mock_options->User, service_2->directory,
-                                     service_2->dir_group_readable, 1);
-  tt_int_op(ret, OP_EQ, 0);
-  smartlist_add(services, service_2);
-
-  /* A new service, and an existing poisoned service. Not ok. */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_LT, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* But ok to add in non-anonymous mode. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Now remove the poisoning from the first service, and we have the opposite
-   * problem. */
-  poison_path = rend_service_sos_poison_path(service_1);
-  tt_assert(poison_path);
-  ret = unlink(poison_path);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Unpoisoned service directories with previous keys are ok, as are empty
-   * directories. */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* But the existing unpoisoned key is not ok in non-anonymous mode, even if
-   * there is an empty service. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_LT, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Poisoning directories with existing keys is a no-op, because directories
-   * with existing keys are ignored. But the new directory should poison. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_poison_new_single_onion_dir(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_poison_new_single_onion_dir(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  /* And the old directory remains unpoisoned. */
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_LT, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* And the new directory should be ignored, because it has no key. */
-  mock_options->HiddenServiceSingleHopMode = 0;
-  mock_options->HiddenServiceNonAnonymousMode = 0;
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
-  /* Re-poisoning directories without existing keys is a no-op. */
-  mock_options->HiddenServiceSingleHopMode = 1;
-  mock_options->HiddenServiceNonAnonymousMode = 1;
-  ret = rend_service_poison_new_single_onion_dir(service_1, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  ret = rend_service_poison_new_single_onion_dir(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-  /* And the old directory remains unpoisoned. */
-  ret = rend_service_verify_single_onion_poison(service_1, mock_options);
-  tt_int_op(ret, OP_LT, 0);
-  ret = rend_service_verify_single_onion_poison(service_2, mock_options);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  /* The test harness deletes the directories at exit */
-  tor_free(poison_path);
-  tor_free(dir1);
-  tor_free(dir2);
-  smartlist_free(services);
-  rend_service_free(service_1);
-  rend_service_free(service_2);
-  UNMOCK(get_options);
-  tor_free(mock_options->DataDirectory);
-  tor_free(err_msg);
-}
-
-static rend_service_t *
-helper_create_rend_service(const char *path)
-{
-  rend_service_t *s = tor_malloc_zero(sizeof(rend_service_t));
-  s->ports = smartlist_new();
-  s->intro_nodes = smartlist_new();
-  s->expiring_nodes = smartlist_new();
-  if (path) {
-    s->directory = tor_strdup(path);
-  }
-  return s;
-}
-
-static void
-test_prune_services_on_reload(void *arg)
-{
-  smartlist_t *new = smartlist_new(), *old = smartlist_new();
-  /* Non ephemeral service. */
-  rend_service_t *s1 = helper_create_rend_service("SomePath");
-  /* Create a non ephemeral service with the _same_ path as so we can test the
-   * transfer of introduction point between the same services on reload. */
-  rend_service_t *s2 = helper_create_rend_service(s1->directory);
-  /* Ephemeral service (directory is NULL). */
-  rend_service_t *e1 = helper_create_rend_service(NULL);
-  rend_service_t *e2 = helper_create_rend_service(NULL);
-
-  (void) arg;
-
-  {
-    /* Add both services to the old list. */
-    smartlist_add(old, s1);
-    smartlist_add(old, e1);
-    /* Only put the non ephemeral in the new list. */
-    smartlist_add(new, s1);
-    set_rend_service_list(old);
-    set_rend_rend_service_staging_list(new);
-    rend_service_prune_list_impl_();
-    /* We expect that the ephemeral one is in the new list but removed from
-     * the old one. */
-    tt_int_op(smartlist_len(old), OP_EQ, 1);
-    tt_assert(smartlist_get(old, 0) == s1);
-    tt_int_op(smartlist_len(new), OP_EQ, 2);
-    tt_assert(smartlist_get(new, 0) == s1);
-    tt_assert(smartlist_get(new, 1) == e1);
-    /* Cleanup for next test. */
-    smartlist_clear(new);
-    smartlist_clear(old);
-  }
-
-  {
-    /* This test will make sure that only the ephemeral service is kept if the
-     * new list is empty. The old list should contain only the non ephemeral
-     * one. */
-    smartlist_add(old, s1);
-    smartlist_add(old, e1);
-    set_rend_service_list(old);
-    set_rend_rend_service_staging_list(new);
-    rend_service_prune_list_impl_();
-    tt_int_op(smartlist_len(old), OP_EQ, 1);
-    tt_assert(smartlist_get(old, 0) == s1);
-    tt_int_op(smartlist_len(new), OP_EQ, 1);
-    tt_assert(smartlist_get(new, 0) == e1);
-    /* Cleanup for next test. */
-    smartlist_clear(new);
-    smartlist_clear(old);
-  }
-
-  {
-    /* This test makes sure that the new list stays the same even from the old
-     * list being completely different. */
-    smartlist_add(new, s1);
-    smartlist_add(new, e1);
-    set_rend_service_list(old);
-    set_rend_rend_service_staging_list(new);
-    rend_service_prune_list_impl_();
-    tt_int_op(smartlist_len(old), OP_EQ, 0);
-    tt_int_op(smartlist_len(new), OP_EQ, 2);
-    tt_assert(smartlist_get(new, 0) == s1);
-    tt_assert(smartlist_get(new, 1) == e1);
-    /* Cleanup for next test. */
-    smartlist_clear(new);
-  }
-
-  {
-    rend_intro_point_t ip1;
-    /* This IP should be found in the s2 service after pruning. */
-    smartlist_add(s1->intro_nodes, &ip1);
-    /* Setup our list. */
-    smartlist_add(old, s1);
-    smartlist_add(new, s2);
-    set_rend_service_list(old);
-    set_rend_rend_service_staging_list(new);
-    rend_service_prune_list_impl_();
-    tt_int_op(smartlist_len(old), OP_EQ, 1);
-    /* Intro nodes have been moved to the s2 in theory so it must be empty. */
-    tt_int_op(smartlist_len(s1->intro_nodes), OP_EQ, 0);
-    tt_int_op(smartlist_len(new), OP_EQ, 1);
-    rend_service_t *elem = smartlist_get(new, 0);
-    tt_assert(elem);
-    tt_assert(elem == s2);
-    tt_int_op(smartlist_len(elem->intro_nodes), OP_EQ, 1);
-    tt_assert(smartlist_get(elem->intro_nodes, 0) == &ip1);
-    smartlist_clear(s1->intro_nodes);
-    smartlist_clear(s2->intro_nodes);
-    /* Cleanup for next test. */
-    smartlist_clear(new);
-    smartlist_clear(old);
-  }
-
-  {
-    /* Test two ephemeral services. */
-    smartlist_add(old, e1);
-    smartlist_add(old, e2);
-    set_rend_service_list(old);
-    set_rend_rend_service_staging_list(new);
-    rend_service_prune_list_impl_();
-    /* Check if they've all been transferred. */
-    tt_int_op(smartlist_len(old), OP_EQ, 0);
-    tt_int_op(smartlist_len(new), OP_EQ, 2);
-  }
-
- done:
-  rend_service_free(s1);
-  rend_service_free(s2);
-  rend_service_free(e1);
-  rend_service_free(e2);
-  smartlist_free(new);
-  smartlist_free(old);
-}
-
-struct testcase_t hs_tests[] = {
-  { "hs_rend_data", test_hs_rend_data, TT_FORK,
-    NULL, NULL },
-  { "hs_parse_static_v2_desc", test_hs_parse_static_v2_desc, TT_FORK,
-    NULL, NULL },
-  { "hs_desc_event", test_hs_desc_event, TT_FORK,
-    NULL, NULL },
-  { "hs_auth_cookies", test_hs_auth_cookies, TT_FORK,
-    NULL, NULL },
-  { "single_onion_poisoning_create_dir_none", test_single_onion_poisoning,
-    TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR_NONE) },
-  { "single_onion_poisoning_create_dir1", test_single_onion_poisoning,
-    TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1) },
-  { "single_onion_poisoning_create_dir2", test_single_onion_poisoning,
-    TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR2) },
-  { "single_onion_poisoning_create_dir_both", test_single_onion_poisoning,
-    TT_FORK, &passthrough_setup, (void*)(CREATE_HS_DIR1 | CREATE_HS_DIR2) },
-  { "prune_services_on_reload", test_prune_services_on_reload, TT_FORK,
-    NULL, NULL },
-
-  END_OF_TESTCASES
-};
diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c
index df96b2c791..c3e0eee691 100644
--- a/src/test/test_hs_cache.c
+++ b/src/test/test_hs_cache.c
@@ -14,7 +14,6 @@
 
 #include "trunnel/ed25519_cert.h"
 #include "feature/hs/hs_cache.h"
-#include "feature/rend/rendcache.h"
 #include "feature/dircache/dircache.h"
 #include "feature/dirclient/dirclient.h"
 #include "feature/nodelist/networkstatus.h"
@@ -51,8 +50,6 @@ init_test(void)
 {
   /* Always needed. Initialize the subsystem. */
   hs_cache_init();
-  /* We need the v2 cache since our OOM and cache cleanup does poke at it. */
-  rend_cache_init();
 }
 
 static void
diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c
index f59b3a59cd..7df9fc5d31 100644
--- a/src/test/test_hs_client.c
+++ b/src/test/test_hs_client.c
@@ -19,7 +19,6 @@
 #include "test/test.h"
 #include "test/test_helpers.h"
 #include "test/log_test_helpers.h"
-#include "test/rend_test_helpers.h"
 #include "test/hs_test_helpers.h"
 
 #include "app/config/config.h"
@@ -38,7 +37,6 @@
 #include "feature/hs/hs_config.h"
 #include "feature/hs/hs_ident.h"
 #include "feature/hs/hs_cache.h"
-#include "feature/rend/rendcache.h"
 #include "core/or/circuitlist.h"
 #include "core/or/circuitbuild.h"
 #include "core/or/extendinfo.h"
@@ -137,12 +135,9 @@ helper_add_random_client_auth(const ed25519_public_key_t *service_pk)
  * hidden service. */
 static int
 helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out,
-                                    connection_t **conn_out,
-                                    int is_legacy)
+                                    connection_t **conn_out)
 {
-  int retval;
   channel_tls_t *n_chan=NULL;
-  rend_data_t *conn_rend_data = NULL;
   origin_circuit_t *or_circ = NULL;
   connection_t *conn = NULL;
   ed25519_public_key_t service_pk;
@@ -151,20 +146,13 @@ helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out,
   conn = test_conn_get_connection(AP_CONN_STATE_CIRCUIT_WAIT,
                                   CONN_TYPE_AP /* ??? */,
                                   0);
-  if (is_legacy) {
-    /* Legacy: Setup rend_data of stream */
-    char service_id[REND_SERVICE_ID_LEN_BASE32+1] = {0};
-    TO_EDGE_CONN(conn)->rend_data = mock_rend_data(service_id);
-    conn_rend_data = TO_EDGE_CONN(conn)->rend_data;
-  } else {
-    /* prop224: Setup hs conn identifier on the stream */
-    ed25519_secret_key_t sk;
-    tt_int_op(0, OP_EQ, ed25519_secret_key_generate(&sk, 0));
-    tt_int_op(0, OP_EQ, ed25519_public_key_generate(&service_pk, &sk));
-
-    /* Setup hs_conn_identifier of stream */
-    TO_EDGE_CONN(conn)->hs_ident = hs_ident_edge_conn_new(&service_pk);
-  }
+  /* prop224: Setup hs conn identifier on the stream */
+  ed25519_secret_key_t sk;
+  tt_int_op(0, OP_EQ, ed25519_secret_key_generate(&sk, 0));
+  tt_int_op(0, OP_EQ, ed25519_public_key_generate(&service_pk, &sk));
+
+  /* Setup hs_conn_identifier of stream */
+  TO_EDGE_CONN(conn)->hs_ident = hs_ident_edge_conn_new(&service_pk);
 
   /* Make it wait for circuit */
   connection_ap_mark_as_pending_circuit(TO_ENTRY_CONN(conn));
@@ -184,23 +172,8 @@ helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out,
   or_circ->build_state = tor_malloc_zero(sizeof(cpath_build_state_t));
   or_circ->build_state->is_internal = 1;
 
-  if (is_legacy) {
-    /* Legacy: Setup rend data and final cpath */
-    or_circ->build_state->pending_final_cpath =
-      tor_malloc_zero(sizeof(crypt_path_t));
-    or_circ->build_state->pending_final_cpath->magic = CRYPT_PATH_MAGIC;
-    or_circ->build_state->pending_final_cpath->rend_dh_handshake_state =
-      crypto_dh_new(DH_TYPE_REND);
-    tt_assert(
-         or_circ->build_state->pending_final_cpath->rend_dh_handshake_state);
-    retval = crypto_dh_generate_public(
-           or_circ->build_state->pending_final_cpath->rend_dh_handshake_state);
-    tt_int_op(retval, OP_EQ, 0);
-    or_circ->rend_data = rend_data_dup(conn_rend_data);
-  } else {
-    /* prop224: Setup hs ident on the circuit */
-    or_circ->hs_ident = hs_ident_circuit_new(&service_pk);
-  }
+  /* prop224: Setup hs ident on the circuit */
+  or_circ->hs_ident = hs_ident_circuit_new(&service_pk);
 
   TO_CIRCUIT(or_circ)->state = CIRCUIT_STATE_OPEN;
 
@@ -219,91 +192,6 @@ helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out,
   return -1;
 }
 
-/* Test: Ensure that setting up legacy e2e rendezvous circuits works
- * correctly. */
-static void
-test_e2e_rend_circuit_setup_legacy(void *arg)
-{
-  ssize_t retval;
-  origin_circuit_t *or_circ = NULL;
-  connection_t *conn = NULL;
-
-  (void) arg;
-
-  /** In this test we create a v2 legacy HS stream and a circuit with the same
-   *  hidden service destination. We make the stream wait for circuits to be
-   *  established to the hidden service, and then we complete the circuit using
-   *  the hs_circuit_setup_e2e_rend_circ_legacy_client() function. We then
-   *  check that the end-to-end cpath was setup correctly and that the stream
-   *  was attached to the circuit as expected. */
-
-  MOCK(connection_ap_handshake_send_begin,
-       mock_connection_ap_handshake_send_begin);
-
-  /* Setup */
-  retval = helper_get_circ_and_stream_for_test( &or_circ, &conn, 1);
-  tt_int_op(retval, OP_EQ, 0);
-  tt_assert(or_circ);
-  tt_assert(conn);
-
-  /* Check number of hops */
-  retval = cpath_get_n_hops(&or_circ->cpath);
-  tt_int_op(retval, OP_EQ, 0);
-
-  /* Check that our stream is not attached on any circuits */
-  tt_ptr_op(TO_EDGE_CONN(conn)->on_circuit, OP_EQ, NULL);
-
-  /********************************************** */
-
-  /* Make a good RENDEZVOUS1 cell body because it needs to pass key exchange
-   * digest verification... */
-  uint8_t rend_cell_body[DH1024_KEY_LEN+DIGEST_LEN] = {2};
-  {
-    char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN];
-    crypto_dh_t *dh_state =
-      or_circ->build_state->pending_final_cpath->rend_dh_handshake_state;
-    /* compute and overwrite digest of cell body with the right value */
-    retval = crypto_dh_compute_secret(LOG_PROTOCOL_WARN, dh_state,
-                                      (char*)rend_cell_body, DH1024_KEY_LEN,
-                                      keys, DIGEST_LEN+CPATH_KEY_MATERIAL_LEN);
-    tt_int_op(retval, OP_GT, 0);
-    memcpy(rend_cell_body+DH1024_KEY_LEN, keys, DIGEST_LEN);
-  }
-
-  /* Setup the circuit */
-  retval = hs_circuit_setup_e2e_rend_circ_legacy_client(or_circ,
-                                                        rend_cell_body);
-  tt_int_op(retval, OP_EQ, 0);
-
-  /**********************************************/
-
-  /* See that a hop was added to the circuit's cpath */
-  retval = cpath_get_n_hops(&or_circ->cpath);
-  tt_int_op(retval, OP_EQ, 1);
-
-  /* Check the digest algo */
-  tt_int_op(
-         crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.f_digest),
-            OP_EQ, DIGEST_SHA1);
-  tt_int_op(
-         crypto_digest_get_algorithm(or_circ->cpath->pvt_crypto.b_digest),
-            OP_EQ, DIGEST_SHA1);
-  tt_assert(or_circ->cpath->pvt_crypto.f_crypto);
-  tt_assert(or_circ->cpath->pvt_crypto.b_crypto);
-
-  /* Ensure that circ purpose was changed */
-  tt_int_op(or_circ->base_.purpose, OP_EQ, CIRCUIT_PURPOSE_C_REND_JOINED);
-
-  /* Test that stream got attached */
-  tt_ptr_op(TO_EDGE_CONN(conn)->on_circuit, OP_EQ, TO_CIRCUIT(or_circ));
-
- done:
-  connection_free_minimal(conn);
-  if (or_circ)
-    tor_free(TO_CIRCUIT(or_circ)->n_chan);
-  circuit_free_(TO_CIRCUIT(or_circ));
-}
-
 /* Test: Ensure that setting up v3 rendezvous circuits works correctly. */
 static void
 test_e2e_rend_circuit_setup(void *arg)
@@ -326,7 +214,7 @@ test_e2e_rend_circuit_setup(void *arg)
        mock_connection_ap_handshake_send_begin);
 
   /* Setup */
-  retval = helper_get_circ_and_stream_for_test(&or_circ, &conn, 0);
+  retval = helper_get_circ_and_stream_for_test(&or_circ, &conn);
   tt_int_op(retval, OP_EQ, 0);
   tt_assert(or_circ);
   tt_assert(conn);
@@ -974,7 +862,6 @@ test_close_intro_circuits_new_desc(void *arg)
   (void) arg;
 
   hs_init();
-  rend_cache_init();
 
   /* This is needed because of the client cache expiration timestamp is based
    * on having a consensus. See cached_client_descriptor_has_expired(). */
@@ -1120,7 +1007,6 @@ test_close_intro_circuits_cache_clean(void *arg)
   (void) arg;
 
   hs_init();
-  rend_cache_init();
 
   /* This is needed because of the client cache expiration timestamp is based
    * on having a consensus. See cached_client_descriptor_has_expired(). */
@@ -1189,7 +1075,6 @@ test_close_intro_circuits_cache_clean(void *arg)
   circuit_free(circ);
   hs_descriptor_free(desc1);
   hs_free_all();
-  rend_cache_free_all();
   UNMOCK(networkstatus_get_reasonably_live_consensus);
 }
 
@@ -1554,8 +1439,6 @@ test_purge_ephemeral_client_auth(void *arg)
 }
 
 struct testcase_t hs_client_tests[] = {
-  { "e2e_rend_circuit_setup_legacy", test_e2e_rend_circuit_setup_legacy,
-    TT_FORK, NULL, NULL },
   { "e2e_rend_circuit_setup", test_e2e_rend_circuit_setup,
     TT_FORK, NULL, NULL },
   { "client_pick_intro", test_client_pick_intro,
diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c
index dc3b598c34..104e5effbb 100644
--- a/src/test/test_hs_config.c
+++ b/src/test/test_hs_config.c
@@ -18,7 +18,6 @@
 #include "feature/hs/hs_common.h"
 #include "feature/hs/hs_config.h"
 #include "feature/hs/hs_service.h"
-#include "feature/rend/rendservice.h"
 
 static int
 helper_config_service(const char *conf, int validate_only)
@@ -49,7 +48,7 @@ test_invalid_service(void *arg)
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
     tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("HiddenServiceVersion must be between 2 and 3");
+    expect_log_msg_containing("HiddenServiceVersion must be between 3 and 3");
     teardown_capture_of_logs();
   }
 
@@ -57,7 +56,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServiceAllowUnknownPorts 2\n"; /* Should be 0 or 1. */
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -72,7 +71,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServiceDirGroupReadable 2\n"; /* Should be 0 or 1. */
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -87,7 +86,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServiceMaxStreamsCloseCircuit 2\n"; /* Should be 0 or 1. */
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -102,7 +101,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServicePort 80\n"
       "HiddenServiceMaxStreams 65536\n"; /* One too many. */
     setup_full_capture_of_logs(LOG_WARN);
@@ -117,10 +116,10 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServicePort 80\n"
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServicePort 81\n";
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -134,7 +133,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServicePort 65536\n";
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -147,7 +146,7 @@ test_invalid_service(void *arg)
   {
     const char *conf =
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServicePort 80 127.0.0.1 8000\n";
     setup_full_capture_of_logs(LOG_WARN);
     ret = helper_config_service(conf, 1);
@@ -160,7 +159,7 @@ test_invalid_service(void *arg)
   /* Out of order directives. */
   {
     const char *conf =
-      "HiddenServiceVersion 2\n"
+      "HiddenServiceVersion 3\n"
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
       "HiddenServicePort 80\n";
     setup_full_capture_of_logs(LOG_WARN);
@@ -182,18 +181,11 @@ test_valid_service(void *arg)
 
   (void) arg;
 
-  /* Mix of v2 and v3. Still valid. */
   {
     const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
       "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs2\n"
       "HiddenServiceVersion 3\n"
-      "HiddenServicePort 81\n"
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs3\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 82\n";
+      "HiddenServicePort 81\n";
     ret = helper_config_service(conf, 1);
     tt_int_op(ret, OP_EQ, 0);
   }
@@ -203,127 +195,6 @@ test_valid_service(void *arg)
 }
 
 static void
-test_invalid_service_v2(void *arg)
-{
-  int validate_only = 1, ret;
-
-  (void) arg;
-
-  /* Try with a missing port configuration. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n";
-    setup_full_capture_of_logs(LOG_WARN);
-    ret = helper_config_service(conf, validate_only);
-    tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("with no ports configured.");
-    teardown_capture_of_logs();
-  }
-
-  /* Too many introduction points. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
-      "HiddenServiceNumIntroductionPoints 11\n"; /* One too many. */
-    setup_full_capture_of_logs(LOG_WARN);
-    ret = helper_config_service(conf, validate_only);
-    tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("HiddenServiceNumIntroductionPoints must "
-                              "be between 0 and 10, not 11.");
-    teardown_capture_of_logs();
-  }
-
-  /* Too little introduction points. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
-      "HiddenServiceNumIntroductionPoints -1\n";
-    setup_full_capture_of_logs(LOG_WARN);
-    ret = helper_config_service(conf, validate_only);
-    tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("Could not parse "
-                              "HiddenServiceNumIntroductionPoints: "
-                              "Integer -1 is malformed or out of bounds.");
-    teardown_capture_of_logs();
-  }
-
-  /* Bad authorized client type. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
-      "HiddenServiceAuthorizeClient blah alice,bob\n"; /* blah is no good. */
-    setup_full_capture_of_logs(LOG_WARN);
-    ret = helper_config_service(conf, validate_only);
-    tt_int_op(ret, OP_EQ, -1);
-    expect_log_msg_containing("HiddenServiceAuthorizeClient contains "
-                              "unrecognized auth-type");
-    teardown_capture_of_logs();
-  }
-
- done:
-  ;
-}
-
-static void
-test_valid_service_v2(void *arg)
-{
-  int ret;
-
-  (void) arg;
-  mock_hostname_resolver();
-
-  /* Valid complex configuration. Basic client authorization. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
-      "HiddenServicePort 22 localhost:22\n"
-#ifdef HAVE_SYS_UN_H
-      "HiddenServicePort 42 unix:/path/to/socket\n"
-#endif
-      "HiddenServiceAuthorizeClient basic alice,bob,eve\n"
-      "HiddenServiceAllowUnknownPorts 1\n"
-      "HiddenServiceMaxStreams 42\n"
-      "HiddenServiceMaxStreamsCloseCircuit 0\n"
-      "HiddenServiceDirGroupReadable 1\n"
-      "HiddenServiceNumIntroductionPoints 7\n";
-    ret = helper_config_service(conf, 1);
-    tt_int_op(ret, OP_EQ, 0);
-  }
-
-  /* Valid complex configuration. Stealth client authorization. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs2\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 65535\n"
-      "HiddenServicePort 22 1.1.1.1:22\n"
-#ifdef HAVE_SYS_UN_H
-      "HiddenServicePort 9000 unix:/path/to/socket\n"
-#endif
-      "HiddenServiceAuthorizeClient stealth charlie,romeo\n"
-      "HiddenServiceAllowUnknownPorts 0\n"
-      "HiddenServiceMaxStreams 42\n"
-      "HiddenServiceMaxStreamsCloseCircuit 0\n"
-      "HiddenServiceDirGroupReadable 1\n"
-      "HiddenServiceNumIntroductionPoints 8\n";
-    ret = helper_config_service(conf, 1);
-    tt_int_op(ret, OP_EQ, 0);
-  }
-
- done:
-  unmock_hostname_resolver();
-}
-
-static void
 test_invalid_service_v3(void *arg)
 {
   int validate_only = 1, ret;
@@ -438,22 +309,6 @@ test_valid_service_v3(void *arg)
     tt_int_op(ret, OP_EQ, 0);
   }
 
-  /* Mix of v2 and v3. Still valid. */
-  {
-    const char *conf =
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 80\n"
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs2\n"
-      "HiddenServiceVersion 3\n"
-      "HiddenServicePort 81\n"
-      "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs3\n"
-      "HiddenServiceVersion 2\n"
-      "HiddenServicePort 82\n";
-    ret = helper_config_service(conf, 1);
-    tt_int_op(ret, OP_EQ, 0);
-  }
-
  done:
   unmock_hostname_resolver();
 }
@@ -489,8 +344,6 @@ test_staging_service_v3(void *arg)
   tt_int_op(ret, OP_EQ, 0);
   /* Ok, we have a service in our map! Registration went well. */
   tt_int_op(get_hs_service_staging_list_size(), OP_EQ, 1);
-  /* Make sure we don't have a magic v2 service out of this. */
-  tt_int_op(rend_num_services(), OP_EQ, 0);
 
  done:
   hs_free_all();
@@ -611,12 +464,6 @@ struct testcase_t hs_config_tests[] = {
   { "valid_service", test_valid_service, TT_FORK,
     NULL, NULL },
 
-  /* Test case only for version 2. */
-  { "invalid_service_v2", test_invalid_service_v2, TT_FORK,
-    NULL, NULL },
-  { "valid_service_v2", test_valid_service_v2, TT_FORK,
-    NULL, NULL },
-
   /* Test case only for version 3. */
   { "invalid_service_v3", test_invalid_service_v3, TT_FORK,
     NULL, NULL },
diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c
index dfc1e5445e..e4999a4ed5 100644
--- a/src/test/test_hs_control.c
+++ b/src/test/test_hs_control.c
@@ -25,7 +25,6 @@
 #include "feature/hs/hs_client.h"
 #include "feature/hs/hs_control.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/rend/rendservice.h"
 
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerstatus_st.h"
@@ -797,7 +796,7 @@ test_hs_control_add_onion_helper_add_service(void *arg)
   hs_service_authorized_client_t *client_good, *client_bad;
   smartlist_t *list_good, *list_bad;
   hs_service_ht *global_map;
-  rend_service_port_config_t *portcfg;
+  hs_port_config_t *portcfg;
   smartlist_t *portcfgs;
   char *address_out_good, *address_out_bad;
   hs_service_t *service_good = NULL;
@@ -808,7 +807,7 @@ test_hs_control_add_onion_helper_add_service(void *arg)
   hs_init();
   global_map = get_hs_service_map();
 
-  portcfg = rend_service_parse_port_config("8080", ",", NULL);
+  portcfg = hs_parse_port_config("8080", ",", NULL);
   portcfgs = smartlist_new();
   smartlist_add(portcfgs, portcfg);
 
@@ -831,7 +830,7 @@ test_hs_control_add_onion_helper_add_service(void *arg)
   smartlist_add(list_good, client_good);
 
   add_onion_helper_add_service(HS_VERSION_THREE, &sk_good, portcfgs, 1, 1,
-                          REND_V3_AUTH, NULL, list_good, &address_out_good);
+                               list_good, &address_out_good);
 
   service_good = find_service(global_map, &pk_good);
   tt_int_op(smartlist_len(service_good->config.clients), OP_EQ, 1);
@@ -841,12 +840,12 @@ test_hs_control_add_onion_helper_add_service(void *arg)
   list_bad = smartlist_new();
   smartlist_add(list_bad, client_bad);
 
-  portcfg = rend_service_parse_port_config("8080", ",", NULL);
+  portcfg = hs_parse_port_config("8080", ",", NULL);
   portcfgs = smartlist_new();
   smartlist_add(portcfgs, portcfg);
 
   add_onion_helper_add_service(HS_VERSION_THREE, &sk_bad, portcfgs, 1, 1,
-                          REND_V3_AUTH, NULL, list_bad, &address_out_bad);
+                               list_bad, &address_out_bad);
 
   service_bad = find_service(global_map, &pk_bad);
 
diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c
index e6b27d7a50..d18de775ae 100644
--- a/src/test/test_hs_intropoint.c
+++ b/src/test/test_hs_intropoint.c
@@ -21,7 +21,6 @@
 #include "core/or/circuituse.h"
 #include "ht.h"
 #include "core/or/relay.h"
-#include "feature/rend/rendservice.h"
 
 #include "feature/hs/hs_cell.h"
 #include "feature/hs/hs_circuitmap.h"
@@ -517,42 +516,6 @@ helper_establish_intro_v3(or_circuit_t *intro_circ)
   return cell;
 }
 
-/* Helper function: Send a well-formed v2 ESTABLISH_INTRO cell to
- * <b>intro_circ</b>. Return the public key advertised in the cell. */
-static crypto_pk_t *
-helper_establish_intro_v2(or_circuit_t *intro_circ)
-{
-  crypto_pk_t *key1 = NULL;
-  int retval;
-  uint8_t cell_body[RELAY_PAYLOAD_SIZE];
-  ssize_t cell_len = 0;
-  char circ_nonce[DIGEST_LEN] = {0};
-
-  tt_assert(intro_circ);
-
-  /* Prepare the circuit for the incoming ESTABLISH_INTRO */
-  crypto_rand(circ_nonce, sizeof(circ_nonce));
-  helper_prepare_circ_for_intro(intro_circ, circ_nonce);
-
-  /* Send legacy establish_intro */
-  key1 = pk_generate(0);
-
-  /* Use old circ_nonce why not */
-  cell_len = rend_service_encode_establish_intro_cell(
-                                           (char*)cell_body,
-                                           sizeof(cell_body), key1,
-                                           circ_nonce);
-  tt_int_op(cell_len, OP_GT, 0);
-
-  /* Receive legacy establish_intro */
-  retval = hs_intro_received_establish_intro(intro_circ,
-                                             cell_body, (size_t) cell_len);
-  tt_int_op(retval, OP_EQ, 0);
-
- done:
-  return key1;
-}
-
 /* Helper function: test circuitmap free_all function outside of
  * test_intro_point_registration to prevent Coverity from seeing a
  * double free if the assertion hypothetically fails.
@@ -571,21 +534,17 @@ test_circuitmap_free_all(void)
   ;
 }
 
-/** Successfully register a v2 intro point and a v3 intro point. Ensure that HS
+/** Successfully register a v3 intro point. Ensure that HS
  *  circuitmap is maintained properly. */
 static void
 test_intro_point_registration(void *arg)
 {
-  int retval;
   hs_circuitmap_ht *the_hs_circuitmap = NULL;
 
   or_circuit_t *intro_circ = NULL;
   trn_cell_establish_intro_t *establish_intro_cell = NULL;
   ed25519_public_key_t auth_key;
 
-  crypto_pk_t *legacy_auth_key = NULL;
-  or_circuit_t *legacy_intro_circ = NULL;
-
   or_circuit_t *returned_intro_circ = NULL;
 
   (void) arg;
@@ -621,35 +580,11 @@ test_intro_point_registration(void *arg)
     tt_ptr_op(intro_circ, OP_EQ, returned_intro_circ);
   }
 
-  /* Create a v2 intro point */
-  {
-    char key_digest[DIGEST_LEN];
-
-    legacy_intro_circ = or_circuit_new(1, NULL);
-    tt_assert(legacy_intro_circ);
-    legacy_auth_key = helper_establish_intro_v2(legacy_intro_circ);
-    tt_assert(legacy_auth_key);
-
-    /* Check that the circuitmap now has two elements */
-    the_hs_circuitmap = get_hs_circuitmap();
-    tt_assert(the_hs_circuitmap);
-    tt_int_op(2, OP_EQ, HT_SIZE(the_hs_circuitmap));
-
-    /* Check that the new element is our legacy intro circuit. */
-    retval = crypto_pk_get_digest(legacy_auth_key, key_digest);
-    tt_int_op(retval, OP_EQ, 0);
-    returned_intro_circ =
-      hs_circuitmap_get_intro_circ_v2_relay_side((uint8_t*)key_digest);
-    tt_ptr_op(legacy_intro_circ, OP_EQ, returned_intro_circ);
-  }
-
   /* XXX Continue test and try to register a second v3 intro point with the
    * same auth key. Make sure that old intro circuit gets closed. */
 
  done:
-  crypto_pk_free(legacy_auth_key);
   circuit_free_(TO_CIRCUIT(intro_circ));
-  circuit_free_(TO_CIRCUIT(legacy_intro_circ));
   trn_cell_establish_intro_free(establish_intro_cell);
   test_circuitmap_free_all();
 
@@ -720,31 +655,6 @@ test_introduce1_suitable_circuit(void *arg)
 }
 
 static void
-test_introduce1_is_legacy(void *arg)
-{
-  int ret;
-  uint8_t request[256];
-
-  (void) arg;
-
-  /* For a cell to be considered legacy, according to the specification, the
-   * first 20 bytes MUST BE non-zero else it's a v3 cell. */
-  memset(request, 'a', DIGEST_LEN);
-  memset(request + DIGEST_LEN, 0, sizeof(request) - DIGEST_LEN);
-  ret = introduce1_cell_is_legacy(request);
-  tt_int_op(ret, OP_EQ, 1);
-
-  /* This is a NON legacy cell. */
-  memset(request, 0, DIGEST_LEN);
-  memset(request + DIGEST_LEN, 'a', sizeof(request) - DIGEST_LEN);
-  ret = introduce1_cell_is_legacy(request);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  ;
-}
-
-static void
 test_introduce1_validation(void *arg)
 {
   int ret;
@@ -757,20 +667,6 @@ test_introduce1_validation(void *arg)
   cell = helper_create_introduce1_cell();
   tt_assert(cell);
 
-#ifndef ALL_BUGS_ARE_FATAL
-  /* It should NOT be a legacy cell which will trigger a BUG(). */
-  memset(cell->legacy_key_id, 'a', sizeof(cell->legacy_key_id));
-  tor_capture_bugs_(1);
-  ret = validate_introduce1_parsed_cell(cell);
-  tor_end_capture_bugs_();
-  tt_int_op(ret, OP_EQ, -1);
-#endif /* !defined(ALL_BUGS_ARE_FATAL) */
-
-  /* Reset legacy ID and make sure it's correct. */
-  memset(cell->legacy_key_id, 0, sizeof(cell->legacy_key_id));
-  ret = validate_introduce1_parsed_cell(cell);
-  tt_int_op(ret, OP_EQ, 0);
-
   /* Non existing auth key type. */
   cell->auth_key_type = 42;
   ret = validate_introduce1_parsed_cell(cell);
@@ -877,35 +773,6 @@ test_received_introduce1_handling(void *arg)
     tt_int_op(ret, OP_EQ, 0);
   }
 
-  /* Valid legacy cell. */
-  {
-    tor_free(request);
-    trn_cell_introduce1_free(cell);
-    cell = helper_create_introduce1_cell();
-    uint8_t *legacy_key_id = trn_cell_introduce1_getarray_legacy_key_id(cell);
-    memset(legacy_key_id, 'a', DIGEST_LEN);
-    /* Add an arbitrary amount of data for the payload of a v2 cell. */
-    size_t request_len = trn_cell_introduce1_encoded_len(cell) + 256;
-    tt_size_op(request_len, OP_GT, 0);
-    request = tor_malloc_zero(request_len + 256);
-    ssize_t encoded_len =
-      trn_cell_introduce1_encode(request, request_len, cell);
-    tt_int_op((int)encoded_len, OP_GT, 0);
-
-    circ = helper_create_intro_circuit();
-    or_circuit_t *service_circ = helper_create_intro_circuit();
-    circuit_change_purpose(TO_CIRCUIT(service_circ),
-                           CIRCUIT_PURPOSE_INTRO_POINT);
-    /* Register the circuit in the map for the auth key of the cell. */
-    uint8_t token[REND_TOKEN_LEN];
-    memcpy(token, legacy_key_id, sizeof(token));
-    hs_circuitmap_register_intro_circ_v2_relay_side(service_circ, token);
-    ret = hs_intro_received_introduce1(circ, request, request_len);
-    circuit_free_(TO_CIRCUIT(circ));
-    circuit_free_(TO_CIRCUIT(service_circ));
-    tt_int_op(ret, OP_EQ, 0);
-  }
-
  done:
   trn_cell_introduce1_free(cell);
   tor_free(request);
@@ -1109,9 +976,6 @@ struct testcase_t hs_intropoint_tests[] = {
   { "introduce1_suitable_circuit",
     test_introduce1_suitable_circuit, TT_FORK, NULL, &test_setup},
 
-  { "introduce1_is_legacy",
-    test_introduce1_is_legacy, TT_FORK, NULL, &test_setup},
-
   { "introduce1_validation",
     test_introduce1_validation, TT_FORK, NULL, &test_setup},
 
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 66e8e2f473..91d4689848 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -26,7 +26,6 @@
 #include "test/test.h"
 #include "test/test_helpers.h"
 #include "test/log_test_helpers.h"
-#include "test/rend_test_helpers.h"
 #include "test/hs_test_helpers.h"
 
 #include "core/or/or.h"
@@ -58,7 +57,6 @@
 #include "feature/hs/hs_service.h"
 #include "feature/nodelist/networkstatus.h"
 #include "feature/nodelist/nodelist.h"
-#include "feature/rend/rendservice.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/fs/dir.h"
 
@@ -383,14 +381,13 @@ test_load_keys(void *arg)
 {
   int ret;
   char *conf = NULL;
-  char *hsdir_v2 = tor_strdup(get_fname("hs2"));
   char *hsdir_v3 = tor_strdup(get_fname("hs3"));
   char addr[HS_SERVICE_ADDR_LEN_BASE32 + 1];
 
   (void) arg;
 
-  /* We'll register two services, a v2 and a v3, then we'll load keys and
-   * validate that both are in a correct state. */
+  /* We'll register one service then we'll load keys and validate that both
+   * are in a correct state. */
 
   hs_init();
 
@@ -399,15 +396,6 @@ test_load_keys(void *arg)
   "HiddenServiceVersion %d\n" \
   "HiddenServicePort 65535\n"
 
-  /* v2 service. */
-  tor_asprintf(&conf, conf_fmt, hsdir_v2, HS_VERSION_TWO);
-  ret = helper_config_service(conf);
-  tor_free(conf);
-  tt_int_op(ret, OP_EQ, 0);
-  /* This one should now be registered into the v2 list. */
-  tt_int_op(get_hs_service_staging_list_size(), OP_EQ, 0);
-  tt_int_op(rend_num_services(), OP_EQ, 1);
-
   /* v3 service. */
   tor_asprintf(&conf, conf_fmt, hsdir_v3, HS_VERSION_THREE);
   ret = helper_config_service(conf);
@@ -441,7 +429,6 @@ test_load_keys(void *arg)
   tt_assert(!s->config.is_client_auth_enabled);
 
  done:
-  tor_free(hsdir_v2);
   tor_free(hsdir_v3);
   hs_free_all();
 }
@@ -634,8 +621,8 @@ test_access_service(void *arg)
 
   (void) arg;
 
-  /* We'll register two services, a v2 and a v3, then we'll load keys and
-   * validate that both are in a correct state. */
+  /* We'll register one service then we'll load keys and validate that both
+   * are in a correct state. */
 
   hs_init();
 
diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c
deleted file mode 100644
index 0ae78496b2..0000000000
--- a/src/test/test_introduce.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* Copyright (c) 2012-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#include "orconfig.h"
-#include "lib/crypt_ops/crypto_cipher.h"
-#include "core/or/or.h"
-#include "test/test.h"
-
-#define RENDSERVICE_PRIVATE
-#include "feature/rend/rendservice.h"
-
-static uint8_t v0_test_plaintext[] =
-    /* 20 bytes of rendezvous point nickname */
-  { 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    /* 20 bytes dummy rendezvous cookie */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 128 bytes dummy DH handshake data */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
-
-static uint8_t v1_test_plaintext[] =
-    /* Version byte */
-  { 0x01,
-    /* 42 bytes of dummy rendezvous point hex digest */
-    0x24, 0x30, 0x30, 0x30, 0x31, 0x30, 0x32, 0x30,
-    0x33, 0x30, 0x34, 0x30, 0x35, 0x30, 0x36, 0x30,
-    0x37, 0x30, 0x38, 0x30, 0x39, 0x30, 0x41, 0x30,
-    0x42, 0x30, 0x43, 0x30, 0x44, 0x30, 0x45, 0x30,
-    0x46, 0x31, 0x30, 0x31, 0x31, 0x31, 0x32, 0x31,
-    0x33, 0x00,
-    /* 20 bytes dummy rendezvous cookie */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 128 bytes dummy DH handshake data */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
-
-static uint8_t v2_test_plaintext[] =
-    /* Version byte */
-  { 0x02,
-    /* 4 bytes rendezvous point's IP address */
-    0xc0, 0xa8, 0x00, 0x01,
-    /* 2 bytes rendezvous point's OR port */
-    0x23, 0x5a,
-    /* 20 bytes dummy rendezvous point's identity digest */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 2 bytes length of onion key */
-    0x00, 0x8c,
-    /* Onion key (140 bytes taken from live test) */
-    0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xb1,
-    0xcd, 0x46, 0xa9, 0x18, 0xd2, 0x0f, 0x01, 0xf8,
-    0xb2, 0xad, 0xa4, 0x79, 0xb4, 0xbb, 0x4b, 0xf4,
-    0x54, 0x1e, 0x3f, 0x03, 0x54, 0xcf, 0x7c, 0xb6,
-    0xb5, 0xf0, 0xfe, 0xed, 0x4b, 0x7d, 0xd7, 0x61,
-    0xdb, 0x6d, 0xd9, 0x19, 0xe2, 0x72, 0x04, 0xaa,
-    0x3e, 0x89, 0x26, 0x14, 0x62, 0x9a, 0x6c, 0x11,
-    0x0b, 0x35, 0x99, 0x2c, 0x9f, 0x2c, 0x64, 0xa1,
-    0xd9, 0xe2, 0x88, 0xce, 0xf6, 0x54, 0xfe, 0x1d,
-    0x37, 0x5e, 0x6d, 0x73, 0x95, 0x54, 0x90, 0xf0,
-    0x7b, 0xfa, 0xd4, 0x44, 0xac, 0xb2, 0x23, 0x9f,
-    0x75, 0x36, 0xe2, 0x78, 0x62, 0x82, 0x80, 0xa4,
-    0x23, 0x22, 0xc9, 0xbf, 0xc4, 0x36, 0xd1, 0x31,
-    0x33, 0x8e, 0x64, 0xb4, 0xa9, 0x74, 0xa1, 0xcb,
-    0x42, 0x8d, 0x60, 0xc7, 0xbb, 0x8e, 0x6e, 0x0f,
-    0x36, 0x74, 0x8e, 0xf4, 0x08, 0x99, 0x06, 0x92,
-    0xb1, 0x3f, 0xb3, 0xdd, 0xed, 0xf7, 0xc9, 0x02,
-    0x03, 0x01, 0x00, 0x01,
-    /* 20 bytes dummy rendezvous cookie */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 128 bytes dummy DH handshake data */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
-
-static uint8_t v3_no_auth_test_plaintext[] =
-    /* Version byte */
-  { 0x03,
-    /* Auth type (0 for no auth len/auth data) */
-    0x00,
-    /* Timestamp */
-    0x50, 0x0b, 0xb5, 0xaa,
-    /* 4 bytes rendezvous point's IP address */
-    0xc0, 0xa8, 0x00, 0x01,
-    /* 2 bytes rendezvous point's OR port */
-    0x23, 0x5a,
-    /* 20 bytes dummy rendezvous point's identity digest */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 2 bytes length of onion key */
-    0x00, 0x8c,
-    /* Onion key (140 bytes taken from live test) */
-    0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xb1,
-    0xcd, 0x46, 0xa9, 0x18, 0xd2, 0x0f, 0x01, 0xf8,
-    0xb2, 0xad, 0xa4, 0x79, 0xb4, 0xbb, 0x4b, 0xf4,
-    0x54, 0x1e, 0x3f, 0x03, 0x54, 0xcf, 0x7c, 0xb6,
-    0xb5, 0xf0, 0xfe, 0xed, 0x4b, 0x7d, 0xd7, 0x61,
-    0xdb, 0x6d, 0xd9, 0x19, 0xe2, 0x72, 0x04, 0xaa,
-    0x3e, 0x89, 0x26, 0x14, 0x62, 0x9a, 0x6c, 0x11,
-    0x0b, 0x35, 0x99, 0x2c, 0x9f, 0x2c, 0x64, 0xa1,
-    0xd9, 0xe2, 0x88, 0xce, 0xf6, 0x54, 0xfe, 0x1d,
-    0x37, 0x5e, 0x6d, 0x73, 0x95, 0x54, 0x90, 0xf0,
-    0x7b, 0xfa, 0xd4, 0x44, 0xac, 0xb2, 0x23, 0x9f,
-    0x75, 0x36, 0xe2, 0x78, 0x62, 0x82, 0x80, 0xa4,
-    0x23, 0x22, 0xc9, 0xbf, 0xc4, 0x36, 0xd1, 0x31,
-    0x33, 0x8e, 0x64, 0xb4, 0xa9, 0x74, 0xa1, 0xcb,
-    0x42, 0x8d, 0x60, 0xc7, 0xbb, 0x8e, 0x6e, 0x0f,
-    0x36, 0x74, 0x8e, 0xf4, 0x08, 0x99, 0x06, 0x92,
-    0xb1, 0x3f, 0xb3, 0xdd, 0xed, 0xf7, 0xc9, 0x02,
-    0x03, 0x01, 0x00, 0x01,
-    /* 20 bytes dummy rendezvous cookie */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 128 bytes dummy DH handshake data */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
-
-static uint8_t v3_basic_auth_test_plaintext[] =
-    /* Version byte */
-  { 0x03,
-    /* Auth type (1 for REND_BASIC_AUTH) */
-    0x01,
-    /* Auth len (must be 16 bytes for REND_BASIC_AUTH) */
-    0x00, 0x10,
-    /* Auth data (a 16-byte dummy descriptor cookie) */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    /* Timestamp */
-    0x50, 0x0b, 0xb5, 0xaa,
-    /* 4 bytes rendezvous point's IP address */
-    0xc0, 0xa8, 0x00, 0x01,
-    /* 2 bytes rendezvous point's OR port */
-    0x23, 0x5a,
-    /* 20 bytes dummy rendezvous point's identity digest */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 2 bytes length of onion key */
-    0x00, 0x8c,
-    /* Onion key (140 bytes taken from live test) */
-    0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xb1,
-    0xcd, 0x46, 0xa9, 0x18, 0xd2, 0x0f, 0x01, 0xf8,
-    0xb2, 0xad, 0xa4, 0x79, 0xb4, 0xbb, 0x4b, 0xf4,
-    0x54, 0x1e, 0x3f, 0x03, 0x54, 0xcf, 0x7c, 0xb6,
-    0xb5, 0xf0, 0xfe, 0xed, 0x4b, 0x7d, 0xd7, 0x61,
-    0xdb, 0x6d, 0xd9, 0x19, 0xe2, 0x72, 0x04, 0xaa,
-    0x3e, 0x89, 0x26, 0x14, 0x62, 0x9a, 0x6c, 0x11,
-    0x0b, 0x35, 0x99, 0x2c, 0x9f, 0x2c, 0x64, 0xa1,
-    0xd9, 0xe2, 0x88, 0xce, 0xf6, 0x54, 0xfe, 0x1d,
-    0x37, 0x5e, 0x6d, 0x73, 0x95, 0x54, 0x90, 0xf0,
-    0x7b, 0xfa, 0xd4, 0x44, 0xac, 0xb2, 0x23, 0x9f,
-    0x75, 0x36, 0xe2, 0x78, 0x62, 0x82, 0x80, 0xa4,
-    0x23, 0x22, 0xc9, 0xbf, 0xc4, 0x36, 0xd1, 0x31,
-    0x33, 0x8e, 0x64, 0xb4, 0xa9, 0x74, 0xa1, 0xcb,
-    0x42, 0x8d, 0x60, 0xc7, 0xbb, 0x8e, 0x6e, 0x0f,
-    0x36, 0x74, 0x8e, 0xf4, 0x08, 0x99, 0x06, 0x92,
-    0xb1, 0x3f, 0xb3, 0xdd, 0xed, 0xf7, 0xc9, 0x02,
-    0x03, 0x01, 0x00, 0x01,
-    /* 20 bytes dummy rendezvous cookie */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x10, 0x11, 0x12, 0x13,
-    /* 128 bytes dummy DH handshake data */
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-    0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
-    0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 };
-
-static void do_decrypt_test(uint8_t *plaintext, size_t plaintext_len);
-static void do_early_parse_test(uint8_t *plaintext, size_t plaintext_len);
-static void do_late_parse_test(uint8_t *plaintext, size_t plaintext_len);
-static void do_parse_test(uint8_t *plaintext, size_t plaintext_len, int phase);
-static ssize_t make_intro_from_plaintext(
-    void *buf, size_t len, crypto_pk_t *key, void **cell_out);
-
-#define EARLY_PARSE_ONLY 1
-#define DECRYPT_ONLY 2
-#define ALL_PARSING 3
-
-static void
-do_early_parse_test(uint8_t *plaintext, size_t plaintext_len)
-{
-  do_parse_test(plaintext, plaintext_len, EARLY_PARSE_ONLY);
-}
-
-static void
-do_decrypt_test(uint8_t *plaintext, size_t plaintext_len)
-{
-  do_parse_test(plaintext, plaintext_len, DECRYPT_ONLY);
-}
-
-static void
-do_late_parse_test(uint8_t *plaintext, size_t plaintext_len)
-{
-  do_parse_test(plaintext, plaintext_len, ALL_PARSING);
-}
-
-/** Test utility function: checks that the <b>plaintext_len</b>-byte string at
- * <b>plaintext</b> is at least superficially parseable.
- */
-static void
-do_parse_test(uint8_t *plaintext, size_t plaintext_len, int phase)
-{
-  crypto_pk_t *k = NULL;
-  ssize_t r;
-  uint8_t *cell = NULL;
-  size_t cell_len;
-  rend_intro_cell_t *parsed_req = NULL;
-  char *err_msg = NULL;
-  char digest[DIGEST_LEN];
-
-  /* Get a key */
-  k = crypto_pk_new();
-  tt_assert(k);
-  r = crypto_pk_read_private_key_from_string(k, AUTHORITY_SIGNKEY_1, -1);
-  tt_assert(!r);
-
-  /* Get digest for future comparison */
-  r = crypto_pk_get_digest(k, digest);
-  tt_assert(r >= 0);
-
-  /* Make a cell out of it */
-  r = make_intro_from_plaintext(
-      plaintext, plaintext_len,
-      k, (void **)(&cell));
-  tt_assert(r > 0);
-  tt_assert(cell);
-  cell_len = r;
-
-  /* Do early parsing */
-  parsed_req = rend_service_begin_parse_intro(cell, cell_len, 2, &err_msg);
-  tt_assert(parsed_req);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_mem_op(parsed_req->pk,OP_EQ, digest, DIGEST_LEN);
-  tt_assert(parsed_req->ciphertext);
-  tt_assert(parsed_req->ciphertext_len > 0);
-
-  if (phase == EARLY_PARSE_ONLY)
-    goto done;
-
-  /* Do decryption */
-  r = rend_service_decrypt_intro(parsed_req, k, &err_msg);
-  tt_assert(!r);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_assert(parsed_req->plaintext);
-  tt_assert(parsed_req->plaintext_len > 0);
-
-  if (phase == DECRYPT_ONLY)
-    goto done;
-
-  /* Do late parsing */
-  r = rend_service_parse_intro_plaintext(parsed_req, &err_msg);
-  tt_assert(!r);
-  tt_ptr_op(err_msg, OP_EQ, NULL);
-  tt_assert(parsed_req->parsed);
-
- done:
-  tor_free(cell);
-  crypto_pk_free(k);
-  rend_service_free_intro(parsed_req);
-  tor_free(err_msg);
-}
-
-/** Given the plaintext of the encrypted part of an INTRODUCE1/2 and a key,
- * construct the encrypted cell for testing.
- */
-
-static ssize_t
-make_intro_from_plaintext(
-    void *buf, size_t len, crypto_pk_t *key, void **cell_out)
-{
-  char *cell = NULL;
-  ssize_t cell_len = -1, r;
-  /* Assemble key digest and ciphertext, then construct the cell */
-  ssize_t ciphertext_size;
-
-  if (!(buf && key && len > 0 && cell_out)) goto done;
-
-  /*
-   * Figure out an upper bound on how big the ciphertext will be
-   * (see crypto_pk_obsolete_public_hybrid_encrypt())
-   */
-  ciphertext_size = PKCS1_OAEP_PADDING_OVERHEAD;
-  ciphertext_size += crypto_pk_keysize(key);
-  ciphertext_size += CIPHER_KEY_LEN;
-  ciphertext_size += len;
-
-  /*
-   * Allocate space for the cell
-   */
-  cell = tor_malloc(DIGEST_LEN + ciphertext_size);
-
-  /* Compute key digest (will be first DIGEST_LEN octets of cell) */
-  r = crypto_pk_get_digest(key, cell);
-  tt_assert(r >= 0);
-
-  /* Do encryption */
-  r = crypto_pk_obsolete_public_hybrid_encrypt(
-      key, cell + DIGEST_LEN, ciphertext_size,
-      buf, len,
-      PK_PKCS1_OAEP_PADDING, 0);
-  tt_assert(r >= 0);
-
-  /* Figure out cell length */
-  cell_len = DIGEST_LEN + r;
-
-  /* Output the cell */
-  *cell_out = cell;
-  cell = NULL;
-
- done:
-  tor_free(cell);
-  return cell_len;
-}
-
-/** Test v0 INTRODUCE2 parsing through decryption only
- */
-
-static void
-test_introduce_decrypt_v0(void *arg)
-{
-  (void)arg;
-  do_decrypt_test(v0_test_plaintext, sizeof(v0_test_plaintext));
-}
-
-/** Test v1 INTRODUCE2 parsing through decryption only
- */
-
-static void
-test_introduce_decrypt_v1(void *arg)
-{
-  (void)arg;
-  do_decrypt_test(v1_test_plaintext, sizeof(v1_test_plaintext));
-}
-
-/** Test v2 INTRODUCE2 parsing through decryption only
- */
-
-static void
-test_introduce_decrypt_v2(void *arg)
-{
-  (void)arg;
-  do_decrypt_test(v2_test_plaintext, sizeof(v2_test_plaintext));
-}
-
-/** Test v3 INTRODUCE2 parsing through decryption only
- */
-
-static void
-test_introduce_decrypt_v3(void *arg)
-{
-  (void)arg;
-  do_decrypt_test(
-      v3_no_auth_test_plaintext, sizeof(v3_no_auth_test_plaintext));
-  do_decrypt_test(
-      v3_basic_auth_test_plaintext, sizeof(v3_basic_auth_test_plaintext));
-}
-
-/** Test v0 INTRODUCE2 parsing through early parsing only
- */
-
-static void
-test_introduce_early_parse_v0(void *arg)
-{
-  (void)arg;
-  do_early_parse_test(v0_test_plaintext, sizeof(v0_test_plaintext));
-}
-
-/** Test v1 INTRODUCE2 parsing through early parsing only
- */
-
-static void
-test_introduce_early_parse_v1(void *arg)
-{
-  (void)arg;
-  do_early_parse_test(v1_test_plaintext, sizeof(v1_test_plaintext));
-}
-
-/** Test v2 INTRODUCE2 parsing through early parsing only
- */
-
-static void
-test_introduce_early_parse_v2(void *arg)
-{
-  (void)arg;
-  do_early_parse_test(v2_test_plaintext, sizeof(v2_test_plaintext));
-}
-
-/** Test v3 INTRODUCE2 parsing through early parsing only
- */
-
-static void
-test_introduce_early_parse_v3(void *arg)
-{
-  (void)arg;
-  do_early_parse_test(
-      v3_no_auth_test_plaintext, sizeof(v3_no_auth_test_plaintext));
-  do_early_parse_test(
-      v3_basic_auth_test_plaintext, sizeof(v3_basic_auth_test_plaintext));
-}
-
-/** Test v0 INTRODUCE2 parsing
- */
-
-static void
-test_introduce_late_parse_v0(void *arg)
-{
-  (void)arg;
-  do_late_parse_test(v0_test_plaintext, sizeof(v0_test_plaintext));
-}
-
-/** Test v1 INTRODUCE2 parsing
- */
-
-static void
-test_introduce_late_parse_v1(void *arg)
-{
-  (void)arg;
-  do_late_parse_test(v1_test_plaintext, sizeof(v1_test_plaintext));
-}
-
-/** Test v2 INTRODUCE2 parsing
- */
-
-static void
-test_introduce_late_parse_v2(void *arg)
-{
-  (void)arg;
-  do_late_parse_test(v2_test_plaintext, sizeof(v2_test_plaintext));
-}
-
-/** Test v3 INTRODUCE2 parsing
- */
-
-static void
-test_introduce_late_parse_v3(void *arg)
-{
-  (void)arg;
-  do_late_parse_test(
-      v3_no_auth_test_plaintext, sizeof(v3_no_auth_test_plaintext));
-  do_late_parse_test(
-      v3_basic_auth_test_plaintext, sizeof(v3_basic_auth_test_plaintext));
-}
-
-#define INTRODUCE_LEGACY(name) \
-  { #name, test_introduce_ ## name , 0, NULL, NULL }
-
-struct testcase_t introduce_tests[] = {
-  INTRODUCE_LEGACY(early_parse_v0),
-  INTRODUCE_LEGACY(early_parse_v1),
-  INTRODUCE_LEGACY(early_parse_v2),
-  INTRODUCE_LEGACY(early_parse_v3),
-  INTRODUCE_LEGACY(decrypt_v0),
-  INTRODUCE_LEGACY(decrypt_v1),
-  INTRODUCE_LEGACY(decrypt_v2),
-  INTRODUCE_LEGACY(decrypt_v3),
-  INTRODUCE_LEGACY(late_parse_v0),
-  INTRODUCE_LEGACY(late_parse_v1),
-  INTRODUCE_LEGACY(late_parse_v2),
-  INTRODUCE_LEGACY(late_parse_v3),
-  END_OF_TESTCASES
-};
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
deleted file mode 100644
index 06167635c1..0000000000
--- a/src/test/test_rendcache.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-/* Copyright (c) 2010-2020, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#include "orconfig.h"
-#include "core/or/or.h"
-
-#include "test/test.h"
-#define RENDCACHE_PRIVATE
-#include "feature/rend/rendcache.h"
-#include "feature/relay/router.h"
-#include "feature/nodelist/routerlist.h"
-#include "app/config/config.h"
-#include "feature/hs/hs_common.h"
-
-#include "core/or/extend_info_st.h"
-#include "feature/rend/rend_encoded_v2_service_descriptor_st.h"
-#include "feature/rend/rend_intro_point_st.h"
-#include "feature/rend/rend_service_descriptor_st.h"
-#include "feature/nodelist/routerinfo_st.h"
-
-#include "test/rend_test_helpers.h"
-#include "test/log_test_helpers.h"
-
-static const int RECENT_TIME = -10;
-static const int TIME_IN_THE_PAST = -(REND_CACHE_MAX_AGE + \
-                                      REND_CACHE_MAX_SKEW + 60);
-static const int TIME_IN_THE_FUTURE = REND_CACHE_MAX_SKEW + 60;
-
-static void
-test_rend_cache_lookup_entry(void *data)
-{
-  int ret;
-  rend_data_t *mock_rend_query = NULL;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-  rend_cache_entry_t *entry = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder = NULL;
-  char *service_id = NULL;
-  (void)data;
-
-  rend_cache_init();
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-
-  ret = rend_cache_lookup_entry("abababababababab", 0, NULL);
-  tt_int_op(ret, OP_EQ, -ENOENT);
-
-  ret = rend_cache_lookup_entry("invalid query", 2, NULL);
-  tt_int_op(ret, OP_EQ, -EINVAL);
-
-  ret = rend_cache_lookup_entry("abababababababab", 2, NULL);
-  tt_int_op(ret, OP_EQ, -ENOENT);
-
-  ret = rend_cache_lookup_entry("abababababababab", 4224, NULL);
-  tt_int_op(ret, OP_EQ, -ENOENT);
-
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  rend_cache_store_v2_desc_as_client(desc_holder->desc_str, desc_id_base32,
-                                     mock_rend_query, NULL);
-
-  ret = rend_cache_lookup_entry(service_id, 2, NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  ret = rend_cache_lookup_entry(service_id, 2, &entry);
-  tt_int_op(ret, OP_EQ, 0);
-  tt_assert(entry);
-  tt_int_op(entry->len, OP_EQ, strlen(desc_holder->desc_str));
-  tt_str_op(entry->desc, OP_EQ, desc_holder->desc_str);
-
- done:
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_cache_free_all();
-  rend_data_free(mock_rend_query);
-}
-
-static void
-test_rend_cache_store_v2_desc_as_client(void *data)
-{
-  int ret;
-  rend_data_t *mock_rend_query;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-  rend_cache_entry_t *entry = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder = NULL;
-  char *service_id = NULL;
-  char client_cookie[REND_DESC_COOKIE_LEN];
-  (void)data;
-
-  rend_cache_init();
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-
-  // Test success
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           &entry);
-
-  tt_int_op(ret, OP_EQ, 0);
-  tt_assert(entry);
-  tt_int_op(entry->len, OP_EQ, strlen(desc_holder->desc_str));
-  tt_str_op(entry->desc, OP_EQ, desc_holder->desc_str);
-
-  // Test various failure modes
-
-  // TODO: a too long desc_id_base32 argument crashes the function
-   /* ret = rend_cache_store_v2_desc_as_client( */
-   /*                   desc_holder->desc_str, */
-   /*                   "3TOOLONG3TOOLONG3TOOLONG3TOOLONG3TOOLONG3TOOLONG", */
-   /*                   &mock_rend_query, NULL); */
-  /* tt_int_op(ret, OP_EQ, -1); */
-
-  // Test bad base32 failure
-  // This causes an assertion failure if we're running with assertions.
-  // But when building without asserts, we can test it.
-#ifdef DISABLE_ASSERTS_IN_UNIT_TESTS
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                   "!xqunszqnaolrrfmtzgaki7mxelgvkj", mock_rend_query, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-#endif
-
-  // Test invalid descriptor
-  ret = rend_cache_store_v2_desc_as_client("invalid descriptor",
-             "3xqunszqnaolrrfmtzgaki7mxelgvkje", mock_rend_query, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-
-  // TODO: it doesn't seem to be possible to test invalid service ID condition.
-  // that means it is likely not possible to have that condition without
-  // earlier conditions failing first (such as signature checking of the desc)
-
-  rend_cache_free_all();
-
-  // Test mismatch between service ID and onion address
-  rend_cache_init();
-  strncpy(TO_REND_DATA_V2(mock_rend_query)->onion_address, "abc",
-          REND_SERVICE_ID_LEN_BASE32+1);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32,
-                                           mock_rend_query, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  rend_cache_free_all();
-  rend_data_free(mock_rend_query);
-
-  // Test incorrect descriptor ID
-  rend_cache_init();
-  mock_rend_query = mock_rend_data(service_id);
-  char orig = desc_id_base32[0];
-  if (desc_id_base32[0] == 'a')
-    desc_id_base32[0] = 'b';
-  else
-    desc_id_base32[0] = 'a';
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  desc_id_base32[0] = orig;
-  rend_cache_free_all();
-
-  // Test too old descriptor
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(TIME_IN_THE_PAST, &desc_holder, &service_id, 3);
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32,
-                                           mock_rend_query, NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  rend_cache_free_all();
-
-  // Test too new descriptor (in the future)
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(TIME_IN_THE_FUTURE, &desc_holder, &service_id, 3);
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  rend_cache_free_all();
-
-  // Test when a descriptor is already in the cache
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-
-  rend_cache_store_v2_desc_as_client(desc_holder->desc_str, desc_id_base32,
-                                     mock_rend_query, NULL);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           &entry);
-  tt_int_op(ret, OP_EQ, 0);
-  tt_assert(entry);
-  rend_cache_free_all();
-
-  // Test unsuccessful decrypting of introduction points
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-  mock_rend_query = mock_rend_data(service_id);
-  TO_REND_DATA_V2(mock_rend_query)->auth_type = REND_BASIC_AUTH;
-  client_cookie[0] = 'A';
-  memcpy(TO_REND_DATA_V2(mock_rend_query)->descriptor_cookie, client_cookie,
-         REND_DESC_COOKIE_LEN);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, 0);
-  rend_cache_free_all();
-
-  // Test successful run when we have REND_BASIC_AUTH but not cookie
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-  mock_rend_query = mock_rend_data(service_id);
-  TO_REND_DATA_V2(mock_rend_query)->auth_type = REND_BASIC_AUTH;
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  rend_cache_free_all();
-
-  // Test when we have no introduction points
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 0);
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, -1);
-  rend_cache_free_all();
-
-  // Test when we have too many intro points
-  rend_cache_init();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_data_free(mock_rend_query);
-
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, MAX_INTRO_POINTS+1);
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, -1);
-
- done:
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_cache_free_all();
-  rend_data_free(mock_rend_query);
-}
-
-static void
-test_rend_cache_store_v2_desc_as_client_with_different_time(void *data)
-{
-  int ret;
-  rend_data_t *mock_rend_query;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-  rend_service_descriptor_t *generated = NULL;
-  smartlist_t *descs = smartlist_new();
-  time_t t;
-  char *service_id = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder_newer;
-  rend_encoded_v2_service_descriptor_t *desc_holder_older;
-
-  t = time(NULL);
-  rend_cache_init();
-
-  create_descriptor(&generated, &service_id, 3);
-
-  generated->timestamp = t + RECENT_TIME;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_newer = ((rend_encoded_v2_service_descriptor_t *)
-                       smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  descs = smartlist_new();
-
-  generated->timestamp = (t + RECENT_TIME) - 20;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_older = ((rend_encoded_v2_service_descriptor_t *)
-                       smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-  (void)data;
-
-  // Test when a descriptor is already in the cache and it is newer than the
-  // one we submit
-  mock_rend_query = mock_rend_data(service_id);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32),
-                desc_holder_newer->desc_id, DIGEST_LEN);
-  rend_cache_store_v2_desc_as_client(desc_holder_newer->desc_str,
-                                     desc_id_base32, mock_rend_query, NULL);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder_older->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  rend_cache_free_all();
-
-  // Test when an old descriptor is in the cache and we submit a newer one
-  rend_cache_init();
-  rend_cache_store_v2_desc_as_client(desc_holder_older->desc_str,
-                                     desc_id_base32, mock_rend_query, NULL);
-  ret = rend_cache_store_v2_desc_as_client(desc_holder_newer->desc_str,
-                                           desc_id_base32, mock_rend_query,
-                                           NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  rend_encoded_v2_service_descriptor_free(desc_holder_newer);
-  rend_encoded_v2_service_descriptor_free(desc_holder_older);
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  rend_service_descriptor_free(generated);
-  tor_free(service_id);
-  rend_cache_free_all();
-  rend_data_free(mock_rend_query);
-}
-
-static const routerinfo_t *rcache_lookup_v2_as_dir_get_my_routerinfo(void);
-
-static routerinfo_t *mock_routerinfo;
-
-static const routerinfo_t *
-rcache_lookup_v2_as_dir_get_my_routerinfo(void)
-{
-  if (!mock_routerinfo) {
-    mock_routerinfo = tor_malloc(sizeof(routerinfo_t));
-  }
-
-  return mock_routerinfo;
-}
-
-static void
-test_rend_cache_lookup_v2_desc_as_dir(void *data)
-{
-  int ret;
-  char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
-  rend_encoded_v2_service_descriptor_t *desc_holder = NULL;
-  char *service_id = NULL;
-  const char *ret_desc = NULL;
-
-  (void)data;
-
-  MOCK(router_get_my_routerinfo,
-       rcache_lookup_v2_as_dir_get_my_routerinfo);
-
-  rend_cache_init();
-
-  // Test invalid base32
-  ret = rend_cache_lookup_v2_desc_as_dir("!bababababababab", NULL);
-  tt_int_op(ret, OP_EQ, -1);
-
-  // Test non-existent descriptor but well formed
-  ret = rend_cache_lookup_v2_desc_as_dir("3xqunszqnaolrrfmtzgaki7mxelgvkje",
-                                         NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  // Test existing descriptor
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-  rend_cache_store_v2_desc_as_dir(desc_holder->desc_str);
-  base32_encode(desc_id_base32, sizeof(desc_id_base32), desc_holder->desc_id,
-                DIGEST_LEN);
-  ret = rend_cache_lookup_v2_desc_as_dir(desc_id_base32, &ret_desc);
-  tt_int_op(ret, OP_EQ, 1);
-  tt_assert(ret_desc);
-
- done:
-  UNMOCK(router_get_my_routerinfo);
-  tor_free(mock_routerinfo);
-  rend_cache_free_all();
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-}
-
-static const routerinfo_t *rcache_store_v2_as_dir_get_my_routerinfo(void);
-
-static const routerinfo_t *
-rcache_store_v2_as_dir_get_my_routerinfo(void)
-{
-  return mock_routerinfo;
-}
-
-static void
-test_rend_cache_store_v2_desc_as_dir(void *data)
-{
-  (void)data;
-  int ret;
-  rend_encoded_v2_service_descriptor_t *desc_holder = NULL;
-  char *service_id = NULL;
-
-  MOCK(router_get_my_routerinfo,
-       rcache_store_v2_as_dir_get_my_routerinfo);
-
-  rend_cache_init();
-
-  // Test when we can't parse the descriptor
-  mock_routerinfo = tor_malloc(sizeof(routerinfo_t));
-  ret = rend_cache_store_v2_desc_as_dir("unparseable");
-  tt_int_op(ret, OP_EQ, -1);
-
-  // Test when we have an old descriptor
-  generate_desc(TIME_IN_THE_PAST, &desc_holder, &service_id, 3);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-
-  // Test when we have a descriptor in the future
-  generate_desc(TIME_IN_THE_FUTURE, &desc_holder, &service_id, 3);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-
-  // Test when two descriptors
-  generate_desc(TIME_IN_THE_FUTURE, &desc_holder, &service_id, 3);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-
-  // Test when asking for hidden service statistics  HiddenServiceStatistics
-  rend_cache_purge();
-  generate_desc(RECENT_TIME, &desc_holder, &service_id, 3);
-  get_options_mutable()->HiddenServiceStatistics = 1;
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  UNMOCK(router_get_my_routerinfo);
-  rend_encoded_v2_service_descriptor_free(desc_holder);
-  tor_free(service_id);
-  rend_cache_free_all();
-  tor_free(mock_routerinfo);
-}
-
-static void
-test_rend_cache_store_v2_desc_as_dir_with_different_time(void *data)
-{
-  (void)data;
-
-  int ret;
-  rend_service_descriptor_t *generated = NULL;
-  smartlist_t *descs = smartlist_new();
-  time_t t;
-  char *service_id = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder_newer;
-  rend_encoded_v2_service_descriptor_t *desc_holder_older;
-
-  MOCK(router_get_my_routerinfo,
-       rcache_store_v2_as_dir_get_my_routerinfo);
-
-  rend_cache_init();
-
-  t = time(NULL);
-
-  create_descriptor(&generated, &service_id, 3);
-  generated->timestamp = t + RECENT_TIME;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_newer = ((rend_encoded_v2_service_descriptor_t *)
-                       smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  descs = smartlist_new();
-
-  generated->timestamp = (t + RECENT_TIME) - 20;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_older = ((rend_encoded_v2_service_descriptor_t *)
-                       smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-
-  // Test when we have a newer descriptor stored
-  mock_routerinfo = tor_malloc(sizeof(routerinfo_t));
-  rend_cache_store_v2_desc_as_dir(desc_holder_newer->desc_str);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder_older->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
-  // Test when we have an old descriptor stored
-  rend_cache_purge();
-  rend_cache_store_v2_desc_as_dir(desc_holder_older->desc_str);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder_newer->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  UNMOCK(router_get_my_routerinfo);
-  rend_cache_free_all();
-  rend_service_descriptor_free(generated);
-  tor_free(service_id);
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  rend_encoded_v2_service_descriptor_free(desc_holder_newer);
-  rend_encoded_v2_service_descriptor_free(desc_holder_older);
-  tor_free(mock_routerinfo);
-}
-
-static void
-test_rend_cache_store_v2_desc_as_dir_with_different_content(void *data)
-{
-  (void)data;
-
-  int ret;
-  rend_service_descriptor_t *generated = NULL;
-  smartlist_t *descs = smartlist_new();
-  time_t t;
-  char *service_id = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder_one = NULL;
-  rend_encoded_v2_service_descriptor_t *desc_holder_two = NULL;
-
-  MOCK(router_get_my_routerinfo,
-       rcache_store_v2_as_dir_get_my_routerinfo);
-
-  rend_cache_init();
-
-  t = time(NULL);
-
-  create_descriptor(&generated, &service_id, 3);
-  generated->timestamp = t + RECENT_TIME;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_one = ((rend_encoded_v2_service_descriptor_t *)
-                     smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  descs = smartlist_new();
-
-  generated->timestamp = t + RECENT_TIME;
-  generated->protocols = 41;
-  rend_encode_v2_descriptors(descs, generated, t + RECENT_TIME, 0,
-                             REND_NO_AUTH, NULL, NULL);
-  desc_holder_two = ((rend_encoded_v2_service_descriptor_t *)
-                     smartlist_get(descs, 0));
-  smartlist_set(descs, 0, NULL);
-
-  // Test when we have another descriptor stored, with a different descriptor
-  mock_routerinfo = tor_malloc(sizeof(routerinfo_t));
-  rend_cache_store_v2_desc_as_dir(desc_holder_one->desc_str);
-  ret = rend_cache_store_v2_desc_as_dir(desc_holder_two->desc_str);
-  tt_int_op(ret, OP_EQ, 0);
-
- done:
-  UNMOCK(router_get_my_routerinfo);
-  rend_cache_free_all();
-  rend_service_descriptor_free(generated);
-  tor_free(service_id);
-  SMARTLIST_FOREACH(descs, rend_encoded_v2_service_descriptor_t *, d,
-                    rend_encoded_v2_service_descriptor_free(d));
-  smartlist_free(descs);
-  rend_encoded_v2_service_descriptor_free(desc_holder_one);
-  rend_encoded_v2_service_descriptor_free(desc_holder_two);
-}
-
-static void
-test_rend_cache_init(void *data)
-{
-  (void)data;
-
-  tt_assert_msg(!rend_cache, "rend_cache should be NULL when starting");
-  tt_assert_msg(!rend_cache_v2_dir, "rend_cache_v2_dir should be NULL "
-                "when starting");
-  tt_assert_msg(!rend_cache_failure, "rend_cache_failure should be NULL when "
-                "starting");
-
-  rend_cache_init();
-
-  tt_assert_msg(rend_cache, "rend_cache should not be NULL after initing");
-  tt_assert_msg(rend_cache_v2_dir, "rend_cache_v2_dir should not be NULL "
-                "after initing");
-  tt_assert_msg(rend_cache_failure, "rend_cache_failure should not be NULL "
-                "after initing");
-
-  tt_int_op(strmap_size(rend_cache), OP_EQ, 0);
-  tt_int_op(digestmap_size(rend_cache_v2_dir), OP_EQ, 0);
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 0);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_decrement_allocation(void *data)
-{
-  (void)data;
-
-  // Test when the cache has enough allocations
-  rend_cache_total_allocation = 10;
-  rend_cache_decrement_allocation(3);
-  tt_int_op(rend_cache_total_allocation, OP_EQ, 7);
-
-  // Test when there are not enough allocations
-  rend_cache_total_allocation = 1;
-  setup_full_capture_of_logs(LOG_WARN);
-  rend_cache_decrement_allocation(2);
-  tt_int_op(rend_cache_total_allocation, OP_EQ, 0);
-  expect_single_log_msg_containing(
-                    "Underflow in rend_cache_decrement_allocation");
-  teardown_capture_of_logs();
-
-  // And again
-  rend_cache_decrement_allocation(2);
-  tt_int_op(rend_cache_total_allocation, OP_EQ, 0);
-
- done:
-  teardown_capture_of_logs();
-}
-
-static void
-test_rend_cache_increment_allocation(void *data)
-{
-  (void)data;
-
-  // Test when the cache is not overflowing
-  rend_cache_total_allocation = 5;
-  rend_cache_increment_allocation(3);
-  tt_int_op(rend_cache_total_allocation, OP_EQ, 8);
-
-  // Test when there are too many allocations
-  rend_cache_total_allocation = SIZE_MAX-1;
-  setup_full_capture_of_logs(LOG_WARN);
-  rend_cache_increment_allocation(2);
-  tt_u64_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX);
-  expect_single_log_msg_containing(
-                    "Overflow in rend_cache_increment_allocation");
-  teardown_capture_of_logs();
-
-  // And again
-  rend_cache_increment_allocation(2);
-  tt_u64_op(rend_cache_total_allocation, OP_EQ, SIZE_MAX);
-
- done:
-  teardown_capture_of_logs();
-}
-
-static void
-test_rend_cache_failure_intro_entry_new(void *data)
-{
-  time_t now;
-  rend_cache_failure_intro_t *entry;
-  rend_intro_point_failure_t failure;
-
-  (void)data;
-
-  failure = INTRO_POINT_FAILURE_TIMEOUT;
-  now = time(NULL);
-  entry = rend_cache_failure_intro_entry_new(failure);
-
-  tt_int_op(entry->failure_type, OP_EQ, INTRO_POINT_FAILURE_TIMEOUT);
-  tt_int_op(entry->created_ts, OP_GE, now-5);
-  tt_int_op(entry->created_ts, OP_LE, now+5);
-
- done:
-  tor_free(entry);
-}
-
-static void
-test_rend_cache_failure_intro_lookup(void *data)
-{
-  (void)data;
-  int ret;
-  rend_cache_failure_t *failure;
-  rend_cache_failure_intro_t *ip;
-  rend_cache_failure_intro_t *entry;
-  const char key_ip_one[DIGEST_LEN] = "ip1";
-  const char key_ip_two[DIGEST_LEN] = "ip2";
-  const char key_foo[DIGEST_LEN] = "foo1";
-
-  rend_cache_init();
-
-  failure = rend_cache_failure_entry_new();
-  ip = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  digestmap_set(failure->intro_failures, key_ip_one, ip);
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-
-  // Test not found
-  ret = cache_failure_intro_lookup((const uint8_t *) key_foo, "foo2", NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  // Test found with no intro failures in it
-  ret = cache_failure_intro_lookup((const uint8_t *) key_ip_two, "foo1", NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  // Test found
-  ret = cache_failure_intro_lookup((const uint8_t *) key_ip_one, "foo1", NULL);
-  tt_int_op(ret, OP_EQ, 1);
-
-  // Test found and asking for entry
-  cache_failure_intro_lookup((const uint8_t *) key_ip_one, "foo1", &entry);
-  tt_assert(entry);
-  tt_assert(entry == ip);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_clean(void *data)
-{
-  rend_cache_entry_t *one, *two;
-  rend_service_descriptor_t *desc_one, *desc_two;
-  strmap_iter_t *iter = NULL;
-  const char *key;
-  void *val;
-
-  (void)data;
-
-  rend_cache_init();
-
-  // Test with empty rendcache
-  rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT);
-  tt_int_op(strmap_size(rend_cache), OP_EQ, 0);
-
-  // Test with two old entries
-  one = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  two = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  desc_one = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  desc_two = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  one->parsed = desc_one;
-  two->parsed = desc_two;
-
-  desc_one->timestamp = time(NULL) + TIME_IN_THE_PAST;
-  desc_two->timestamp = (time(NULL) + TIME_IN_THE_PAST) - 10;
-  desc_one->pk = pk_generate(0);
-  desc_two->pk = pk_generate(1);
-
-  strmap_set_lc(rend_cache, "foo1", one);
-  rend_cache_increment_allocation(rend_cache_entry_allocation(one));
-  strmap_set_lc(rend_cache, "foo2", two);
-  rend_cache_increment_allocation(rend_cache_entry_allocation(two));
-
-  rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT);
-  tt_int_op(strmap_size(rend_cache), OP_EQ, 0);
-
-  // Test with one old entry and one newer entry
-  one = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  two = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  desc_one = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  desc_two = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  one->parsed = desc_one;
-  two->parsed = desc_two;
-
-  desc_one->timestamp = (time(NULL) + TIME_IN_THE_PAST) - 10;
-  desc_two->timestamp = time(NULL) - 100;
-  desc_one->pk = pk_generate(0);
-  desc_two->pk = pk_generate(1);
-
-  rend_cache_increment_allocation(rend_cache_entry_allocation(one));
-  strmap_set_lc(rend_cache, "foo1", one);
-  rend_cache_increment_allocation(rend_cache_entry_allocation(two));
-  strmap_set_lc(rend_cache, "foo2", two);
-
-  rend_cache_clean(time(NULL), REND_CACHE_TYPE_CLIENT);
-  tt_int_op(strmap_size(rend_cache), OP_EQ, 1);
-
-  iter = strmap_iter_init(rend_cache);
-  strmap_iter_get(iter, &key, &val);
-  tt_str_op(key, OP_EQ, "foo2");
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_failure_entry_new(void *data)
-{
-  rend_cache_failure_t *failure;
-
-  (void)data;
-
-  failure = rend_cache_failure_entry_new();
-  tt_assert(failure);
-  tt_int_op(digestmap_size(failure->intro_failures), OP_EQ, 0);
-
- done:
-  rend_cache_failure_entry_free(failure);
-}
-
-static void
-test_rend_cache_failure_entry_free(void *data)
-{
-  (void)data;
-
-  // Test that it can deal with a NULL argument
-  rend_cache_failure_entry_free_(NULL);
-
- /* done: */
- /*  (void)0; */
-}
-
-static void
-test_rend_cache_failure_clean(void *data)
-{
-  rend_cache_failure_t *failure;
-  rend_cache_failure_intro_t *ip_one, *ip_two;
-
-  const char key_one[DIGEST_LEN] = "ip1";
-  const char key_two[DIGEST_LEN] = "ip2";
-
-  (void)data;
-
-  rend_cache_init();
-
-  // Test with empty failure cache
-  rend_cache_failure_clean(time(NULL));
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 0);
-
-  // Test with one empty failure entry
-  failure = rend_cache_failure_entry_new();
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-  rend_cache_failure_clean(time(NULL));
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 0);
-
-  // Test with one new intro point
-  failure = rend_cache_failure_entry_new();
-  ip_one = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  digestmap_set(failure->intro_failures, key_one, ip_one);
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-  rend_cache_failure_clean(time(NULL));
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 1);
-
-  // Test with one old intro point
-  rend_cache_failure_purge();
-  failure = rend_cache_failure_entry_new();
-  ip_one = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  ip_one->created_ts = time(NULL) - 7*60;
-  digestmap_set(failure->intro_failures, key_one, ip_one);
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-  rend_cache_failure_clean(time(NULL));
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 0);
-
-  // Test with one old intro point and one new one
-  rend_cache_failure_purge();
-  failure = rend_cache_failure_entry_new();
-  ip_one = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  ip_one->created_ts = time(NULL) - 7*60;
-  digestmap_set(failure->intro_failures, key_one, ip_one);
-  ip_two = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  ip_two->created_ts = time(NULL) - 2*60;
-  digestmap_set(failure->intro_failures, key_two, ip_two);
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-  rend_cache_failure_clean(time(NULL));
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 1);
-  tt_int_op(digestmap_size(failure->intro_failures), OP_EQ, 1);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_failure_remove(void *data)
-{
-  rend_service_descriptor_t *desc;
-  (void)data;
-
-  rend_cache_init();
-
-  // Test that it deals well with a NULL desc
-  rend_cache_failure_remove(NULL);
-
-  // Test a descriptor that isn't in the cache
-  desc = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  desc->pk = pk_generate(0);
-  rend_cache_failure_remove(desc);
-
-  // There seems to not exist any way of getting rend_cache_failure_remove()
-  // to fail because of a problem with rend_get_service_id from here
-  rend_cache_free_all();
-
-  rend_service_descriptor_free(desc);
- /* done: */
- /*  (void)0; */
-}
-
-static void
-test_rend_cache_free_all(void *data)
-{
-  rend_cache_failure_t *failure;
-  rend_cache_entry_t *one;
-  rend_service_descriptor_t *desc_one;
-
-  (void)data;
-
-  rend_cache_init();
-
-  failure = rend_cache_failure_entry_new();
-  strmap_set_lc(rend_cache_failure, "foo1", failure);
-
-  one = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  desc_one = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  one->parsed = desc_one;
-  desc_one->timestamp = time(NULL) + TIME_IN_THE_PAST;
-  desc_one->pk = pk_generate(0);
-  rend_cache_increment_allocation(rend_cache_entry_allocation(one));
-  strmap_set_lc(rend_cache, "foo1", one);
-
-  rend_cache_free_all();
-
-  tt_ptr_op(rend_cache, OP_EQ, NULL);
-  tt_ptr_op(rend_cache_v2_dir, OP_EQ, NULL);
-  tt_ptr_op(rend_cache_failure, OP_EQ, NULL);
-  tt_assert(!rend_cache_total_allocation);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_entry_free(void *data)
-{
-  (void)data;
-  rend_cache_entry_t *e;
-
-  // Handles NULL correctly
-  rend_cache_entry_free_(NULL);
-
-  // Handles NULL descriptor correctly
-  e = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
-  rend_cache_entry_free(e);
-
-  // Handles non-NULL descriptor correctly
-  e = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  e->desc = tor_malloc(10);
-  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
-  rend_cache_entry_free(e);
-
- /* done: */
- /*  (void)0; */
-}
-
-static void
-test_rend_cache_purge(void *data)
-{
-  (void)data;
-
-  // Deals with a NULL rend_cache
-  rend_cache_purge();
-  tt_assert(rend_cache);
-  tt_assert(strmap_size(rend_cache) == 0);
-
-  // Deals with existing rend_cache
-  rend_cache_free_all();
-  rend_cache_init();
-  tt_assert(rend_cache);
-  tt_assert(strmap_size(rend_cache) == 0);
-
-  rend_cache_purge();
-  tt_assert(rend_cache);
-  tt_assert(strmap_size(rend_cache) == 0);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_failure_intro_add(void *data)
-{
-  (void)data;
-  rend_cache_failure_t *fail_entry;
-  rend_cache_failure_intro_t *entry;
-  const char identity[DIGEST_LEN] = "foo1";
-
-  rend_cache_init();
-
-  // Adds non-existing entry
-  cache_failure_intro_add((const uint8_t *) identity, "foo2",
-                          INTRO_POINT_FAILURE_TIMEOUT);
-  fail_entry = strmap_get_lc(rend_cache_failure, "foo2");
-  tt_assert(fail_entry);
-  tt_int_op(digestmap_size(fail_entry->intro_failures), OP_EQ, 1);
-  entry = digestmap_get(fail_entry->intro_failures, identity);
-  tt_assert(entry);
-
-  // Adds existing entry
-  cache_failure_intro_add((const uint8_t *) identity, "foo2",
-                          INTRO_POINT_FAILURE_TIMEOUT);
-  fail_entry = strmap_get_lc(rend_cache_failure, "foo2");
-  tt_assert(fail_entry);
-  tt_int_op(digestmap_size(fail_entry->intro_failures), OP_EQ, 1);
-  entry = digestmap_get(fail_entry->intro_failures, identity);
-  tt_assert(entry);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_intro_failure_note(void *data)
-{
-  (void)data;
-  rend_cache_failure_t *fail_entry;
-  rend_cache_failure_intro_t *entry;
-  const char key[DIGEST_LEN] = "foo1";
-
-  rend_cache_init();
-
-  // Test not found
-  rend_cache_intro_failure_note(INTRO_POINT_FAILURE_TIMEOUT,
-                                (const uint8_t *) key, "foo2");
-  fail_entry = strmap_get_lc(rend_cache_failure, "foo2");
-  tt_assert(fail_entry);
-  tt_int_op(digestmap_size(fail_entry->intro_failures), OP_EQ, 1);
-  entry = digestmap_get(fail_entry->intro_failures, key);
-  tt_assert(entry);
-  tt_int_op(entry->failure_type, OP_EQ, INTRO_POINT_FAILURE_TIMEOUT);
-
-  // Test found
-  rend_cache_intro_failure_note(INTRO_POINT_FAILURE_UNREACHABLE,
-                                (const uint8_t *) key, "foo2");
-  tt_int_op(entry->failure_type, OP_EQ, INTRO_POINT_FAILURE_UNREACHABLE);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_clean_v2_descs_as_dir(void *data)
-{
-  rend_cache_entry_t *e;
-  time_t now, cutoff;
-  rend_service_descriptor_t *desc;
-  now = time(NULL);
-  cutoff = now - (REND_CACHE_MAX_AGE + REND_CACHE_MAX_SKEW);
-  const char key[DIGEST_LEN] = "abcde";
-
-  (void)data;
-
-  rend_cache_init();
-
-  // Test running with an empty cache
-  rend_cache_clean_v2_descs_as_dir(cutoff);
-  tt_int_op(digestmap_size(rend_cache_v2_dir), OP_EQ, 0);
-
-  // Test with only one new entry
-  e = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  e->last_served = now;
-  desc = tor_malloc_zero(sizeof(rend_service_descriptor_t));
-  desc->timestamp = now;
-  desc->pk = pk_generate(0);
-  e->parsed = desc;
-  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
-  digestmap_set(rend_cache_v2_dir, key, e);
-
-  /* Set the cutoff to minus 10 seconds. */
-  rend_cache_clean_v2_descs_as_dir(cutoff - 10);
-  tt_int_op(digestmap_size(rend_cache_v2_dir), OP_EQ, 1);
-
-  // Test with one old entry
-  desc->timestamp = cutoff - 1000;
-  rend_cache_clean_v2_descs_as_dir(cutoff);
-  tt_int_op(digestmap_size(rend_cache_v2_dir), OP_EQ, 0);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_entry_allocation(void *data)
-{
-  (void)data;
-
-  size_t ret;
-  rend_cache_entry_t *e = NULL;
-
-  // Handles a null argument
-  ret = rend_cache_entry_allocation(NULL);
-  tt_int_op(ret, OP_EQ, 0);
-
-  // Handles a non-null argument
-  e = tor_malloc_zero(sizeof(rend_cache_entry_t));
-  ret = rend_cache_entry_allocation(e);
-  tt_int_op(ret, OP_GT, sizeof(rend_cache_entry_t));
-
- done:
-  tor_free(e);
-}
-
-static void
-test_rend_cache_failure_intro_entry_free(void *data)
-{
-  (void)data;
-  rend_cache_failure_intro_t *entry;
-
-  // Handles a null argument
-  rend_cache_failure_intro_entry_free_(NULL);
-
-  // Handles a non-null argument
-  entry = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  rend_cache_failure_intro_entry_free(entry);
-}
-
-static void
-test_rend_cache_failure_purge(void *data)
-{
-  (void)data;
-
-  // Handles a null failure cache
-  strmap_free(rend_cache_failure, rend_cache_failure_entry_free_void);
-  rend_cache_failure = NULL;
-
-  rend_cache_failure_purge();
-
-  tt_ptr_op(rend_cache_failure, OP_NE, NULL);
-  tt_int_op(strmap_size(rend_cache_failure), OP_EQ, 0);
-
- done:
-  rend_cache_free_all();
-}
-
-static void
-test_rend_cache_validate_intro_point_failure(void *data)
-{
-  (void)data;
-  rend_service_descriptor_t *desc = NULL;
-  char *service_id = NULL;
-  rend_intro_point_t *intro = NULL;
-  const char *identity = NULL;
-  rend_cache_failure_t *failure;
-  rend_cache_failure_intro_t *ip;
-
-  rend_cache_init();
-
-  create_descriptor(&desc, &service_id, 3);
-  desc->timestamp = time(NULL) + RECENT_TIME;
-
-  intro = (rend_intro_point_t *)smartlist_get(desc->intro_nodes, 0);
-  identity = intro->extend_info->identity_digest;
-
-  failure = rend_cache_failure_entry_new();
-  ip = rend_cache_failure_intro_entry_new(INTRO_POINT_FAILURE_TIMEOUT);
-  digestmap_set(failure->intro_failures, identity, ip);
-  strmap_set_lc(rend_cache_failure, service_id, failure);
-
-  // Test when we have an intro point in our cache
-  validate_intro_point_failure(desc, service_id);
-  tt_int_op(smartlist_len(desc->intro_nodes), OP_EQ, 2);
-
- done:
-  rend_cache_free_all();
-  rend_service_descriptor_free(desc);
-  tor_free(service_id);
-}
-
-struct testcase_t rend_cache_tests[] = {
-  { "init", test_rend_cache_init, 0, NULL, NULL },
-  { "decrement_allocation", test_rend_cache_decrement_allocation, 0,
-    NULL, NULL },
-  { "increment_allocation", test_rend_cache_increment_allocation, 0,
-    NULL, NULL },
-  { "clean", test_rend_cache_clean, TT_FORK, NULL, NULL },
-  { "clean_v2_descs_as_dir", test_rend_cache_clean_v2_descs_as_dir, 0,
-    NULL, NULL },
-  { "entry_allocation", test_rend_cache_entry_allocation, 0, NULL, NULL },
-  { "entry_free", test_rend_cache_entry_free, 0, NULL, NULL },
-  { "failure_intro_entry_free", test_rend_cache_failure_intro_entry_free, 0,
-    NULL, NULL },
-  { "free_all", test_rend_cache_free_all, 0, NULL, NULL },
-  { "purge", test_rend_cache_purge, 0, NULL, NULL },
-  { "failure_clean", test_rend_cache_failure_clean, 0, NULL, NULL },
-  { "failure_entry_new", test_rend_cache_failure_entry_new, 0, NULL, NULL },
-  { "failure_entry_free", test_rend_cache_failure_entry_free, 0, NULL, NULL },
-  { "failure_intro_add", test_rend_cache_failure_intro_add, 0, NULL, NULL },
-  { "failure_intro_entry_new", test_rend_cache_failure_intro_entry_new, 0,
-    NULL, NULL },
-  { "failure_intro_lookup", test_rend_cache_failure_intro_lookup, 0,
-    NULL, NULL },
-  { "failure_purge", test_rend_cache_failure_purge, 0, NULL, NULL },
-  { "failure_remove", test_rend_cache_failure_remove, 0, NULL, NULL },
-  { "intro_failure_note", test_rend_cache_intro_failure_note, 0, NULL, NULL },
-  { "lookup", test_rend_cache_lookup_entry, 0, NULL, NULL },
-  { "lookup_v2_desc_as_dir", test_rend_cache_lookup_v2_desc_as_dir, 0,
-    NULL, NULL },
-  { "store_v2_desc_as_client", test_rend_cache_store_v2_desc_as_client, 0,
-    NULL, NULL },
-  { "store_v2_desc_as_client_with_different_time",
-    test_rend_cache_store_v2_desc_as_client_with_different_time, 0,
-    NULL, NULL },
-  { "store_v2_desc_as_dir", test_rend_cache_store_v2_desc_as_dir, 0,
-    NULL, NULL },
-  { "store_v2_desc_as_dir_with_different_time",
-    test_rend_cache_store_v2_desc_as_dir_with_different_time, 0, NULL, NULL },
-  { "store_v2_desc_as_dir_with_different_content",
-    test_rend_cache_store_v2_desc_as_dir_with_different_content, 0,
-    NULL, NULL },
-  { "validate_intro_point_failure",
-    test_rend_cache_validate_intro_point_failure, 0, NULL, NULL },
-  END_OF_TESTCASES
-};