Only use num-bigint-dig in benchmarks

RustCrypto · Dec 23, 2023 · 223ad5e · 223ad5e
1 parent ba54933
commit 223ad5e
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -32,8 +32,10 @@ zeroize = { version = "1", optional = true,  default-features = false }
 bincode = "1"
 criterion = { version = "0.5", features = ["html_reports"] }
 hex-literal = "0.4"
-num-bigint = { package = "num-bigint-dig", version = "0.8" }
+num-bigint-dig = "0.8"
+num-bigint = "0.4"
 num-integer = "0.1"
+num-modular = { version = "0.5", features = ["num-bigint"] }
 proptest = "1"
 rand_core = { version = "0.6", features = ["std"] }
 rand_chacha = "0.3"

diff --git a/benches/boxed_monty.rs b/benches/boxed_monty.rs
@@ -6,7 +6,7 @@ use crypto_bigint::{
     modular::{BoxedMontyForm, BoxedMontyParams},
     BoxedUint, NonZero, Odd, RandomMod,
 };
-use num_bigint::BigUint;
+use num_bigint_dig::BigUint;
 use rand_core::OsRng;
 
 /// Size of `BoxedUint` to use in benchmark.

diff --git a/tests/boxed_monty_form.rs b/tests/boxed_monty_form.rs
@@ -6,7 +6,8 @@ use crypto_bigint::{
     modular::{BoxedMontyForm, BoxedMontyParams},
     BoxedUint, Integer, Inverter, Limb, NonZero, Odd, PrecomputeInverter,
 };
-use num_bigint::{BigUint, ModInverse};
+use num_bigint::BigUint;
+use num_modular::ModularUnaryOps;
 use proptest::prelude::*;
 use std::cmp::Ordering;
 
@@ -84,7 +85,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(n.modulus());
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => prop_assert_eq!(exp, to_biguint(&act).into()),
@@ -101,7 +102,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(n.modulus());
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => {

diff --git a/tests/boxed_uint_proptests.rs b/tests/boxed_uint_proptests.rs
@@ -4,8 +4,9 @@
 
 use core::cmp::Ordering;
 use crypto_bigint::{BoxedUint, CheckedAdd, Integer, Limb, NonZero};
-use num_bigint::{BigUint, ModInverse};
+use num_bigint::BigUint;
 use num_integer::Integer as _;
+use num_modular::ModularUnaryOps;
 use num_traits::identities::One;
 use proptest::prelude::*;
 
@@ -170,7 +171,7 @@ proptest! {
 
         let a_bi = to_biguint(&a);
         let b_bi = to_biguint(&b);
-        let expected = a_bi.mod_inverse(b_bi);
+        let expected = a_bi.invm(&b_bi);
         let actual = Option::from(a.inv_mod(&b));
 
         match (expected, actual) {

diff --git a/tests/const_monty_form.rs b/tests/const_monty_form.rs
@@ -1,7 +1,8 @@
 //! Equivalence tests between `crypto_bigint::ConstMontyForm` and `num-bigint`.
 
 use crypto_bigint::{impl_modulus, modular::ConstMontyParams, Encoding, Invert, Inverter, U256};
-use num_bigint::{BigUint, ModInverse};
+use num_bigint::BigUint;
+use num_modular::ModularUnaryOps;
 use proptest::prelude::*;
 
 impl_modulus!(
@@ -38,7 +39,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(&Modulus::MODULUS);
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => {
@@ -59,7 +60,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(&Modulus::MODULUS);
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => {

diff --git a/tests/monty_form.rs b/tests/monty_form.rs
@@ -1,7 +1,8 @@
 //! Equivalence tests between `crypto_bigint::MontyForm` and `num-bigint`.
 
 use crypto_bigint::{Encoding, Integer, Invert, Inverter, NonZero, Odd, PrecomputeInverter, U256};
-use num_bigint::{BigUint, ModInverse};
+use num_bigint::BigUint;
+use num_modular::ModularUnaryOps;
 use proptest::prelude::*;
 
 type MontyForm = crypto_bigint::modular::MontyForm<{ U256::LIMBS }>;
@@ -45,7 +46,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(n.modulus());
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => {
@@ -66,7 +67,7 @@ proptest! {
 
         let x_bi = retrieve_biguint(&x);
         let n_bi = to_biguint(n.modulus());
-        let expected = x_bi.mod_inverse(&n_bi);
+        let expected = x_bi.invm(&n_bi);
 
         match (expected, actual) {
             (Some(exp), Some(act)) => {