torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug#22143/prop#140: Use <n>,$d commands in diffs to remove signatures

Browse Source 
In this patch I add support for "delete through end of file" in our
ed diff handler, and generate our diffs so that they remove
everything after in the consensus after the signatures begin.
This commit is contained in:
Nick Mathewson
2017-05-03 12:34:30 -04:00
parent 5acddbbbf7
commit c8baa9b783
2 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_consdiff.c
+12 -6
View File
@@ -931,18 +931,24 @@ test_consdiff_gen_diff(void *arg)
consensus_split_lines(cons1, cons1_str, area);
diff = consdiff_gen_diff(cons1, cons2, &digests1, &digests2, area);
tt_ptr_op(NULL, OP_NE, diff);
tt_int_op(7, OP_EQ, smartlist_len(diff));
tt_int_op(11, OP_EQ, smartlist_len(diff));
tt_assert(line_str_eq(smartlist_get(diff, 0),
"network-status-diff-version 1"));
tt_assert(line_str_eq(smartlist_get(diff, 1), "hash "
"95D70F5A3CC65F920AA8B44C4563D7781A082674329661884E19E94B79D539C2 "
"7AFECEFA4599BA33D603653E3D2368F648DF4AC4723929B0F7CF39281596B0C1"));
tt_assert(line_str_eq(smartlist_get(diff, 2), "3,4d"));
tt_assert(line_str_eq(smartlist_get(diff, 3), "1a"));
tt_assert(line_str_eq(smartlist_get(diff, 4),
tt_assert(line_str_eq(smartlist_get(diff, 2), "6,$d"));
tt_assert(line_str_eq(smartlist_get(diff, 3), "3,4c"));
tt_assert(line_str_eq(smartlist_get(diff, 4), "bar"));
tt_assert(line_str_eq(smartlist_get(diff, 5),
"directory-signature foo bar"));
tt_assert(line_str_eq(smartlist_get(diff, 6),
"."));
tt_assert(line_str_eq(smartlist_get(diff, 7), "1a"));
tt_assert(line_str_eq(smartlist_get(diff, 8),
"r name aaaaaaaaaaaaaaaaa etc"));
tt_assert(line_str_eq(smartlist_get(diff, 5), "foo"));
tt_assert(line_str_eq(smartlist_get(diff, 6), "."));
tt_assert(line_str_eq(smartlist_get(diff, 9), "foo"));
tt_assert(line_str_eq(smartlist_get(diff, 10), "."));
/* TODO: small real use-cases, i.e. consensuses. */