Fix warnings and add to_compressed

Signed-off-by: Michael Lodder <redmike7@gmail.com>

Author: mikelodder7

Cargo.toml

@@ -26,8 +26,7 @@ byteorder = "1.3.1"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-zeroize = "0.9.3"
-#tiny-keccak = "1.5"
+zeroize = "0.10"
 sha3 = "0.8.2"
 
 [dependencies.amcl]

src/constants.rs

@@ -5,7 +5,7 @@ use super::ECCurve::rom;
 
 pub const MODBYTES: usize = curve_MODBYTES;
 pub const NLEN: usize = curve_NLEN;
-pub const BigNumBits: usize = BASEBITS;
+pub const BIG_NUM_BITS: usize = BASEBITS;
 
 // Byte size of element in group G1, 1 extra byte for compression flag
 pub const GROUP_G1_SIZE: usize = 2 * MODBYTES + 1;
@@ -38,3 +38,5 @@ lazy_static! {
 
 #[cfg(any(feature = "bls381", feature = "bn254"))]
 pub use crate::types_g2::{GENERATOR_G2, GROUP_G2_SIZE, GROUP_GT_SIZE};
+#[cfg(any(feature = "bls381", feature = "bn254"))]
+pub use crate::types_g1::GROUP_G1_COMPRESSED_SIZE;

src/field_elem.rs

@@ -1,9 +1,8 @@
 use rand::prelude::*;
-use crate::constants::{BARRETT_REDC_K, BARRETT_REDC_U, BARRETT_REDC_V, CURVE_ORDER, MODBYTES, NLEN};
+use crate::constants::{BARRETT_REDC_K, BARRETT_REDC_U, BARRETT_REDC_V, CURVE_ORDER, MODBYTES, NLEN, BIG_NUM_BITS};
 use crate::errors::{SerzDeserzError, ValueError};
 use crate::types::{BigNum, DoubleBigNum, Limb};
 use crate::utils::{barrett_reduction, hash_mod_order, random_mod_order};
-use amcl::arch::CHUNK;
 use std::cmp::Ordering;
 use std::fmt;
 use std::hash::{Hash, Hasher};
@@ -196,7 +195,7 @@ impl FieldElement {
     /// Exponentiation modulo curve order, i.e. self^exp % CurveOrder
     pub fn pow(&self, exp: &Self) -> Self {
         let mut base = self.value.clone();
-        let res = base.powmod(&exp.value, &CurveOrder);
+        let res = base.powmod(&exp.value, &CURVE_ORDER);
         res.into()
     }
 
@@ -286,7 +285,7 @@ impl FieldElement {
         for mut bit_vec in bit_vecs.drain(..) {
             let len = bit_vec.len();
             bits.append(&mut bit_vec);
-            bits.append(&mut vec![0; BigNumBits - len]);
+            bits.append(&mut vec![0; BIG_NUM_BITS - len]);
         }
         bits
     }
@@ -1034,7 +1033,7 @@ mod test {
         assert_eq!(FieldElement::from(3u64).nth_bit(2), 0);
         assert_eq!(FieldElement::from(3u64).nth_bit(3), 0);
 
-        let mut rng = rand::thread_rng();
+        let mut rng = thread_rng();
 
         for _ in 0..10 {
             let r = FieldElement::random();
@@ -1058,7 +1057,6 @@ mod test {
         a.or(&b);
         assert_eq!(a, FieldElement::from(6));
 
-        let mut rng = rand::thread_rng();
         for _ in 0..100 {
             let r1 = FieldElement::random();
             let r2 = FieldElement::random();
@@ -1205,21 +1203,21 @@ mod test {
     #[test]
     fn test_to_bits() {
         let mut bits = vec![0, 1, 0, 1];
-        bits.append(&mut vec![0; BigNumBits-4]);
+        bits.append(&mut vec![0; BIG_NUM_BITS-4]);
         assert_eq!(FieldElement::from(10u32).to_bits(), bits);
 
         let mut bits = vec![0, 0, 1, 0, 0, 1, 1];
-        bits.append(&mut vec![0; BigNumBits-7]);
+        bits.append(&mut vec![0; BIG_NUM_BITS-7]);
         assert_eq!(FieldElement::from(100u32).to_bits(), bits);
 
         let mut c = vec![0i64; NLEN];
         c[0] = 2;
         c[1] = 100;
         let m: FieldElement = BigNum::new_ints(&c).into();
         let mut bits = vec![0, 1];
-        bits.append(&mut vec![0; BigNumBits-2]);
+        bits.append(&mut vec![0; BIG_NUM_BITS-2]);
         bits.append(&mut vec![0, 0, 1, 0, 0, 1, 1]);
-        bits.append(&mut vec![0; BigNumBits-7]);
+        bits.append(&mut vec![0; BIG_NUM_BITS-7]);
         assert_eq!(
             m.to_bits(),
             bits

src/group_elem.rs

@@ -136,8 +136,8 @@ macro_rules! impl_group_elem_traits {
 
         impl fmt::Display for $group_element {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                let mut c = self.value.clone();
-                write!(f, "{}", c.tostring())
+                let c = self.value.clone().tostring();
+                write!(f, "{}", c)
             }
         }
 
@@ -849,14 +849,16 @@ macro_rules! impl_group_elem_vec_conversions {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::constants::GROUP_G1_SIZE;
+    use crate::constants::{GROUP_G1_SIZE, GROUP_GT_SIZE};
     #[cfg(any(feature = "bls381", feature = "bn254"))]
     use crate::constants::GROUP_G2_SIZE;
     use crate::group_elem_g1::{G1LookupTable, G1Vector, G1};
     #[cfg(any(feature = "bls381", feature = "bn254"))]
     use crate::group_elem_g2::{G2LookupTable, G2Vector, G2};
     #[cfg(any(feature = "bls381", feature = "bn254"))]
     use crate::field_elem::FieldElementVector;
+    #[cfg(any(feature = "bls381", feature = "bn254"))]
+    use crate::extension_field_gt::GT;
     use std::collections::{HashMap, HashSet};
     use std::time::Instant;
 
@@ -888,9 +890,9 @@ mod test {
 
         to_and_fro_bytes!(G1, GROUP_G1_SIZE);
         #[cfg(any(feature = "bls381", feature = "bn254"))]
-        to_and_fro_bytes!(G2, GroupG2_SIZE);
+        to_and_fro_bytes!(G2, GROUP_G2_SIZE);
         #[cfg(any(feature = "bls381", feature = "bn254"))]
-        to_and_fro_bytes!(GT, GroupGT_SIZE);
+        to_and_fro_bytes!(GT, GROUP_GT_SIZE);
     }
 
     #[test]

src/group_elem_g1.rs

@@ -1,4 +1,4 @@
-use crate::constants::{CURVE_ORDER, GROUP_G1_SIZE};
+use crate::constants::{CURVE_ORDER, GROUP_G1_SIZE, GROUP_G1_COMPRESSED_SIZE};
 use crate::errors::{SerzDeserzError, ValueError};
 use crate::field_elem::{FieldElement, FieldElementVector};
 use crate::group_elem::{GroupElement, GroupElementVector};
@@ -59,7 +59,15 @@ impl GroupElement for G1 {
     }
 
     fn from_bytes(bytes: &[u8]) -> Result<Self, SerzDeserzError> {
-        if bytes.len() != GROUP_G1_SIZE {
+        if bytes[0] == 0x02 || bytes[0] == 0x03 {
+            if bytes.len() != GROUP_G1_COMPRESSED_SIZE {
+                return Err(SerzDeserzError::G1BytesIncorrectSize(
+                    bytes.len(),
+                    GROUP_G1_COMPRESSED_SIZE,
+                ));
+            }
+        }
+        else if bytes.len() != GROUP_G1_SIZE {
             return Err(SerzDeserzError::G1BytesIncorrectSize(
                 bytes.len(),
                 GROUP_G1_SIZE,
@@ -142,6 +150,14 @@ impl G1 {
             .mul2(&a.to_bignum(), &h.to_ecp(), &b.to_bignum())
             .into()
     }
+
+    pub fn to_compressed(&self) -> Vec<u8> {
+        let mut temp = GroupG1::new();
+        temp.copy(&self.value);
+        let mut bytes = [0u8; GROUP_G1_COMPRESSED_SIZE];
+        temp.tobytes(&mut bytes, true);
+        bytes.to_vec()
+    }
 }
 
 impl_group_elem_traits!(G1, GroupG1);
@@ -354,4 +370,16 @@ mod test {
             start.elapsed()
         );
     }
+
+    #[test]
+    fn to_compressed() {
+        let s = FieldElement::random();
+        let g1 = &G1::generator() * &s;
+        let bytes = g1.to_compressed();
+
+        assert_eq!(GROUP_G1_COMPRESSED_SIZE, bytes.len());
+        let res = G1::from_bytes(bytes.as_slice());
+        assert!(res.is_ok());
+        assert_eq!(res.unwrap(), g1);
+    }
 }

src/lib.rs

@@ -43,6 +43,8 @@ pub mod group_elem;
 pub mod group_elem_g1;
 pub mod commitment;
 
+#[cfg(any(feature = "bls381", feature = "bn254"))]
+pub mod types_g1;
 #[cfg(any(feature = "bls381", feature = "bn254"))]
 pub mod types_g2;
 

src/types_g1.rs

@@ -0,0 +1,4 @@
+use crate::constants::MODBYTES;
+
+// Byte size of x field element in group G1, 1 extra byte for compression flag
+pub const GROUP_G1_COMPRESSED_SIZE: usize = MODBYTES + 1;