diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2023-06-20 23:25:27 +0000 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2023-06-23 15:08:54 +0000 |
| commit | 646212ce586a3cc9badf2c268cbc450b207d03c6 (patch) | |
| tree | 534a208e3ed10ccf994bba23f25710a7c11278de /src/test | |
| parent | 9d022be9fcdf82a107336cdf8e5c77413a699b5f (diff) | |
| download | tor-646212ce586a3cc9badf2c268cbc450b207d03c6.tar.gz tor-646212ce586a3cc9badf2c268cbc450b207d03c6.zip | |
Bug 40709: Update and clean up tests for consensus params
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_conflux_pool.c | 3 | ||||
| -rw-r--r-- | src/test/test_hs_client.c | 2 | ||||
| -rw-r--r-- | src/test/test_hs_descriptor.c | 2 | ||||
| -rw-r--r-- | src/test/test_ntor_v3.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/test/test_conflux_pool.c b/src/test/test_conflux_pool.c index 3da85705b3..ad78283fe3 100644 --- a/src/test/test_conflux_pool.c +++ b/src/test/test_conflux_pool.c @@ -6,6 +6,7 @@ #define CRYPT_PATH_PRIVATE #define RELAY_PRIVATE #define CONNECTION_PRIVATE +#define TOR_CONGESTION_CONTROL_COMMON_PRIVATE #define TOR_CONGESTION_CONTROL_PRIVATE #include "core/or/or.h" @@ -25,8 +26,8 @@ #include "core/or/circuitstats.h" #include "core/or/circuitbuild.h" #include "core/or/circuituse.h" -#include "core/or/congestion_control_common.h" #include "core/or/congestion_control_st.h" +#include "core/or/congestion_control_common.h" #include "core/or/extendinfo.h" #include "core/mainloop/netstatus.h" #include "core/crypto/relay_crypto.h" diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index f873d90212..be74da1198 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -15,6 +15,7 @@ #define CIRCUITLIST_PRIVATE #define CONNECTION_PRIVATE #define CRYPT_PATH_PRIVATE +#define TOR_CONGESTION_CONTROL_COMMON_PRIVATE #include "test/test.h" #include "test/test_helpers.h" @@ -54,7 +55,6 @@ #include "core/or/origin_circuit_st.h" #include "core/or/socks_request_st.h" -#define TOR_CONGESTION_CONTROL_PRIVATE #include "core/or/congestion_control_common.h" static int diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index fe9bc24fb2..3b715863ad 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -7,6 +7,7 @@ */ #define HS_DESCRIPTOR_PRIVATE +#define TOR_CONGESTION_CONTROL_COMMON_PRIVATE #include "lib/crypt_ops/crypto_ed25519.h" #include "lib/crypt_ops/crypto_format.h" @@ -24,7 +25,6 @@ #include "test/log_test_helpers.h" #include "test/rng_test_helpers.h" -#define TOR_CONGESTION_CONTROL_PRIVATE #include "core/or/congestion_control_common.h" #ifdef HAVE_CFLAG_WOVERLENGTH_STRINGS diff --git a/src/test/test_ntor_v3.c b/src/test/test_ntor_v3.c index 1d06403076..c4a7d04deb 100644 --- a/src/test/test_ntor_v3.c +++ b/src/test/test_ntor_v3.c @@ -13,7 +13,7 @@ #include "core/crypto/onion_crypto.h" #include "core/or/extend_info_st.h" #include "core/or/crypt_path_st.h" -#define TOR_CONGESTION_CONTROL_PRIVATE +#define TOR_CONGESTION_CONTROL_COMMON_PRIVATE #include "core/or/congestion_control_common.h" #include "app/config/config.h" @@ -262,6 +262,7 @@ test_ntor3_handshake(void *arg) tt_int_op(serv_params.cc_enabled, OP_EQ, 0); /* client off, serv on -> off */ + congestion_control_set_cc_disabled(); serv_ns_params.cc_enabled = 1; run_full_handshake(&serv_ns_params, &client_params, &serv_params); tt_int_op(client_params.cc_enabled, OP_EQ, 0); |