Update the consdiff directory code based on #22143 fixes

These are mostly just identifier renames, except for one place in
routerparse.c where we switch to using a correct hash.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/or/or.h b/src/or/or.h
index b69fcf110b..423f66cdd5 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1938,7 +1938,8 @@ typedef struct cached_dir_t {
   size_t dir_z_len; /**< Length of <b>dir_z</b>. */
   time_t published; /**< When was this object published. */
   common_digests_t digests; /**< Digests of this object (networkstatus only) */
-  uint8_t digest_sha3_full[DIGEST256_LEN]; /**< sha3 digest (also ns only) */
+  /** Sha3 digest (also ns only) */
+  uint8_t digest_sha3_as_signed[DIGEST256_LEN];
   int refcnt; /**< Reference count for this cached_dir_t. */
 } cached_dir_t;
 
@@ -2639,9 +2640,9 @@ typedef struct networkstatus_t {
 
   /** Digests of this document, as signed. */
   common_digests_t digests;
-  /** A SHA3-256 digest of the document, including signatures: used for
+  /** A SHA3-256 digest of the document, not including signatures: used for
    * consensus diffs */
-  uint8_t digest_full_sha3[DIGEST256_LEN];
+  uint8_t digest_sha3_as_signed[DIGEST256_LEN];
 
   /** List of router statuses, sorted by identity digest.  For a vote,
    * the elements are vote_routerstatus_t; for a consensus, the elements