diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-10-01 11:22:47 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-10-01 11:22:47 -0500 |
commit | d19934866417aa9106fb17c39cfec606d33eacdb (patch) | |
tree | a3ff3eb465e2c7ff29c939bc031f6c4eea4e0e61 /src/test | |
parent | 5f9839ee424476de83da8533955da58068e57037 (diff) | |
download | tor-d19934866417aa9106fb17c39cfec606d33eacdb.tar.gz tor-d19934866417aa9106fb17c39cfec606d33eacdb.zip |
Remove versions.h include from routerparse.h
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/fuzz/fuzz_hsdescv3.c | 1 | ||||
-rw-r--r-- | src/test/test_dir.c | 2 | ||||
-rw-r--r-- | src/test/test_hs_service.c | 31 |
3 files changed, 16 insertions, 18 deletions
diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index ce6dfb177a..871fbefa49 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -1,7 +1,6 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#define ROUTERPARSE_PRIVATE #define HS_DESCRIPTOR_PRIVATE #include "core/or/or.h" diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 3b5d6dc3d6..c18aa99fea 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -20,7 +20,6 @@ #define NODE_SELECT_PRIVATE #define RELAY_PRIVATE #define ROUTERLIST_PRIVATE -#define ROUTERPARSE_PRIVATE #define ROUTER_PRIVATE #define UNPARSEABLE_PRIVATE #define VOTEFLAGS_PRIVATE @@ -30,6 +29,7 @@ #include "app/config/confparse.h" #include "core/mainloop/connection.h" #include "core/or/relay.h" +#include "core/or/versions.h" #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" #include "feature/control/control.h" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 67686bbeee..957bf6e103 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -21,7 +21,6 @@ #define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define HS_CLIENT_PRIVATE -#define ROUTERPARSE_PRIVATE #include "test/test.h" #include "test/test_helpers.h" @@ -31,33 +30,33 @@ #include "core/or/or.h" #include "app/config/config.h" +#include "app/config/statefile.h" +#include "core/crypto/hs_ntor.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/mainloop.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" -#include "core/mainloop/connection.h" #include "core/or/connection_edge.h" #include "core/or/edge_connection_st.h" -#include "lib/crypt_ops/crypto_rand.h" -#include "lib/fs/dir.h" -#include "feature/dirauth/dirvote.h" -#include "feature/nodelist/networkstatus.h" -#include "feature/nodelist/nodelist.h" #include "core/or/relay.h" -#include "feature/dirparse/routerparse.h" +#include "core/or/versions.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_config.h" #include "feature/hs/hs_ident.h" #include "feature/hs/hs_intropoint.h" -#include "core/crypto/hs_ntor.h" -#include "feature/hs/hs_circuit.h" -#include "feature/hs/hs_circuitmap.h" #include "feature/hs/hs_service.h" -#include "feature/hs/hs_client.h" -#include "core/mainloop/mainloop.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" #include "feature/rend/rendservice.h" -#include "app/config/statefile.h" -#include "feature/dirauth/shared_random_state.h" -#include "feature/dircommon/voting_schedule.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/fs/dir.h" #include "core/or/cpath_build_state_st.h" #include "core/or/crypt_path_st.h" |