nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

prop224 test: Simplify interface for adding nodes to hash ring.

Browse Source 
We want to have tests with big hash rings so let's make it an one-liner
to add nodes.
This commit is contained in:
George Kadianakis 2017-08-30 14:14:58 +03:00
parent 3cf8da02f7
commit ac9066660e
1 changed files with 13 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/test/test_hs_common.c
View File

@ -362,15 +362,19 @@ test_desc_overlap_period_testnet(void *arg)
static void static void
helper_add_hsdir_to_networkstatus(networkstatus_t *ns, helper_add_hsdir_to_networkstatus(networkstatus_t *ns,
const uint8_t *identity, int identity_idx,
const uint8_t *curr_hsdir_index,
const char *nickname, const char *nickname,
int is_hsdir) int is_hsdir)
{ {
routerstatus_t *rs = tor_malloc_zero(sizeof(routerstatus_t)); routerstatus_t *rs = tor_malloc_zero(sizeof(routerstatus_t));
routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t));
uint8_t identity[DIGEST_LEN];
uint8_t curr_hsdir_index[DIGEST256_LEN];
tor_addr_t ipv4_addr; tor_addr_t ipv4_addr;
memset(identity, identity_idx, sizeof(identity));
memset(curr_hsdir_index, identity_idx, sizeof(curr_hsdir_index));
memcpy(rs->identity_digest, identity, DIGEST_LEN); memcpy(rs->identity_digest, identity, DIGEST_LEN);
rs->is_hs_dir = is_hsdir; rs->is_hs_dir = is_hsdir;
rs->supports_v3_hsdir = 1; rs->supports_v3_hsdir = 1;
@ -435,36 +439,15 @@ test_responsible_hsdirs(void *arg)
ns = networkstatus_get_latest_consensus(); ns = networkstatus_get_latest_consensus();
{ /* First router: HSdir */ { /* First router: HSdir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 1, "igor", 1);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "let_me";
memset(identity, 1, sizeof(identity));
memset(curr_hsdir_index, 1, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 1);
} }
{ /* Second HSDir */ { /* Second HSDir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 2, "victor", 1);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "show_you";
memset(identity, 2, sizeof(identity));
memset(curr_hsdir_index, 2, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 1);
} }
{ /* Third relay but not HSDir */ { /* Third relay but not HSDir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 3, "spyro", 0);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "how_to_dance";
memset(identity, 3, sizeof(identity));
memset(curr_hsdir_index, 3, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 0);
} }
ed25519_keypair_t kp; ed25519_keypair_t kp;
@ -580,25 +563,11 @@ test_desc_reupload_logic(void *arg)
/* Now let's create our hash ring: */ /* Now let's create our hash ring: */
{ /* First HSDir */ { /* First HSDir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 1, "dingus", 1);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "let_me";
memset(identity, 1, sizeof(identity));
memset(curr_hsdir_index, 1, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 1);
} }
{ /* Second HSDir */ { /* Second HSDir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 2, "clive", 1);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "show_you";
memset(identity, 2, sizeof(identity));
memset(curr_hsdir_index, 2, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 1);
} }
/* Now let's upload our desc to all hsdirs */ /* Now let's upload our desc to all hsdirs */
@ -616,14 +585,7 @@ test_desc_reupload_logic(void *arg)
/* Now change the HSDir hash ring by adding another node */ /* Now change the HSDir hash ring by adding another node */
{ /* Third HSDir */ { /* Third HSDir */
uint8_t identity[DIGEST_LEN]; helper_add_hsdir_to_networkstatus(ns, 3, "ringo", 1);
uint8_t curr_hsdir_index[DIGEST256_LEN];
char nickname[] = "how_to_dance";
memset(identity, 3, sizeof(identity));
memset(curr_hsdir_index, 3, sizeof(curr_hsdir_index));
helper_add_hsdir_to_networkstatus(ns, identity,
curr_hsdir_index, nickname, 1);
} }
/* Now call service_desc_hsdirs_changed() and see that it detected the hash /* Now call service_desc_hsdirs_changed() and see that it detected the hash