Merge branch 'main' into note-edits-2

Author: cathieyun

src/range_proof/mod.rs

@@ -690,6 +690,7 @@ mod tests {
     fn detect_dishonest_dealer_during_aggregation() {
         use self::dealer::*;
         use self::party::*;
+        use errors::MPCError;
 
         // Simulate one party
         let m = 1;
@@ -724,7 +725,6 @@ mod tests {
 
         let maybe_share0 = party0.apply_challenge(&poly_challenge);
 
-        // XXX when we have error types, check finer info than "was error"
-        assert!(maybe_share0.is_err());
+        assert!(maybe_share0.unwrap_err() == MPCError::MaliciousDealer);
     }
 }

src/transcript.rs

@@ -26,13 +26,13 @@ fn le_u64(value: u64) -> [u8; 8] {
 
 impl TranscriptProtocol for Transcript {
     fn rangeproof_domain_sep(&mut self, n: u64, m: u64) {
-        self.commit_bytes(b"dom-sep", b"rangeproof");
+        self.commit_bytes(b"dom-sep", b"rangeproof v1");
         self.commit_bytes(b"n", &le_u64(n));
         self.commit_bytes(b"m", &le_u64(m));
     }
 
     fn innerproduct_domain_sep(&mut self, n: u64) {
-        self.commit_bytes(b"dom-sep", b"ipp");
+        self.commit_bytes(b"dom-sep", b"ipp v1");
         self.commit_bytes(b"n", &le_u64(n));
     }