diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-03-11 10:45:03 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-03-11 10:45:03 -0500 |
| commit | 53902963383e1babfccb8a4ffc7ed4e8accf2214 (patch) | |
| tree | fb11ab029e3b215105ca9bcf606328e3b0fcbc6e /src/test | |
| parent | e167910fce2b83d9de3a252cdf02cabdafced14b (diff) | |
| download | tor-53902963383e1babfccb8a4ffc7ed4e8accf2214.tar.gz tor-53902963383e1babfccb8a4ffc7ed4e8accf2214.zip | |
rip out hid_serv_acting_as_directory()
When we made HidServDirectoryV2 always 1, we removed the situation
where a relay could choose not to be an HSDir. Now simplify the
rest of the code to reflect this decision.
(We have to remove two apparently unrelated free() calls in the unit
tests, since they used to free stuff that we created as a side effect
of calling router_get_my_routerinfo(), and now we no longer call that.)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir_handle_get.c | 2 | ||||
| -rw-r--r-- | src/test/test_rendcache.c | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 67bd840baf..c75b2b6632 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -462,8 +462,6 @@ test_dir_handle_get_rendezvous2_on_encrypted_conn_success(void *data) done: UNMOCK(connection_write_to_buf_impl_); NS_UNMOCK(router_get_my_routerinfo); - tor_free(mock_routerinfo->cache_info.signed_descriptor_body); - tor_free(mock_routerinfo); connection_free_(TO_CONN(conn)); tor_free(header); diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 9898e87098..3ccfe5f9bc 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -454,11 +454,6 @@ test_rend_cache_store_v2_desc_as_dir(void *data) rend_cache_init(); - // Test when we are not an HS dir - mock_routerinfo = NULL; - ret = rend_cache_store_v2_desc_as_dir(""); - tt_int_op(ret, OP_EQ, RCS_NOTDIR); - // Test when we can't parse the descriptor mock_routerinfo = tor_malloc(sizeof(routerinfo_t)); ret = rend_cache_store_v2_desc_as_dir("unparseable"); |