Upgrade num

Author: dlubarov

Cargo.toml

@@ -22,8 +22,8 @@ criterion = "0.2"
 [dependencies]
 bimap = { version = "0.4.0" }
 itertools = { version = "0.8.0" }
-num = { version = "0.2.0", features = ["rand"] }
-num-traits = { version = "0.2.8" }
+num = { version = "0.4.0", features = ["rand"] }
+num-traits = { version = "0.2.14" }
 
 [[bench]]
 name = "nth_root"

src/binary_arithmetic.rs

@@ -41,7 +41,7 @@ impl<F: Field> GadgetBuilder<F> {
             let max_term = (BigUint::one() << term.len()) - BigUint::one();
             max_sum += max_term;
         }
-        let sum_bits = max_sum.bits();
+        let sum_bits = max_sum.bits() as usize;
 
         // TODO: Generalize this addition function to support larger operands.
         // We can split the bits into chunks and perform addition on joined chunks.
@@ -188,4 +188,4 @@ mod tests {
         let mut values_0 = binary_unsigned_values!(&x_wire => &BigUint::zero());
         assert!(gadget.execute(&mut values_0));
     }
-}
+}

src/field.rs

@@ -138,7 +138,7 @@ impl<F: Field> Element<F> {
 
     /// The number of bits needed to encode this particular field element.
     pub fn bits(&self) -> usize {
-        self.to_biguint().bits()
+        self.to_biguint().bits() as usize
     }
 
     /// Return the i'th least significant bit. So, for example, x.bit(0) returns the least

src/lcg.rs

@@ -30,7 +30,7 @@ impl LCG {
     }
 
     pub fn next_biguint(&mut self, limit_exclusive: BigUint) -> BigUint {
-        let bits = (&limit_exclusive - BigUint::one()).bits();
+        let bits = (&limit_exclusive - BigUint::one()).bits() as usize;
         loop {
             let n = self.next_biguint_bits(bits);
             if n < limit_exclusive {
@@ -67,4 +67,4 @@ mod tests {
         assert_eq!(lcg.next_u32(), 3519870697);
         assert_eq!(lcg.next_u32(), 2868466484);
     }
-}
+}

src/wire_values.rs

@@ -47,7 +47,7 @@ impl<F: Field> WireValues<F> {
 
     pub fn set_binary_unsigned(&mut self, wire: &BinaryWire, value: &BigUint) {
         let l = wire.len();
-        assert!(value.bits() <= l, "Value does not fit");
+        assert!(value.bits() <= l as u64, "Value does not fit");
 
         for i in 0..l {
             let value = ((value >> i) & BigUint::one()).is_one();
@@ -118,4 +118,4 @@ macro_rules! binary_unsigned_values {
             values
         }
     }
-}
+}