Have Ciphersuite re-export Group

crypto/frost/src/curve/ed448.rs

@@ -1,10 +1,7 @@
 use digest::Digest;
 
-use group::GroupEncoding;
-
 use minimal_ed448::{Scalar, Point};
-
-pub use ciphersuite::{Shake256_114, Ed448};
+pub use ciphersuite::{group::GroupEncoding, Shake256_114, Ed448};
 
 use crate::{curve::Curve, algorithm::Hram};
 

crypto/frost/src/curve/kp256.rs

@@ -1,6 +1,4 @@
-use group::GroupEncoding;
-
-use ciphersuite::Ciphersuite;
+use ciphersuite::{group::GroupEncoding, Ciphersuite};
 
 use crate::{curve::Curve, algorithm::Hram};
 

crypto/frost/src/curve/mod.rs

@@ -8,13 +8,14 @@ use subtle::ConstantTimeEq;
 
 use digest::{Digest, Output};
 
-use group::{
-  ff::{Field, PrimeField},
-  Group,
+pub use ciphersuite::{
+  group::{
+    ff::{Field, PrimeField},
+    Group,
+  },
+  Ciphersuite,
 };
 
-pub use ciphersuite::Ciphersuite;
-
 #[cfg(any(feature = "ristretto", feature = "ed25519"))]
 mod dalek;
 #[cfg(feature = "ristretto")]

crypto/frost/src/nonce.rs

@@ -21,7 +21,7 @@ use zeroize::{Zeroize, Zeroizing};
 
 use transcript::Transcript;
 
-use group::{ff::PrimeField, Group, GroupEncoding};
+use ciphersuite::group::{ff::PrimeField, Group, GroupEncoding};
 use multiexp::multiexp_vartime;
 
 use dleq::MultiDLEqProof;

crypto/frost/src/sign.rs

@@ -11,7 +11,7 @@ use zeroize::{Zeroize, Zeroizing};
 
 use transcript::Transcript;
 
-use group::{ff::PrimeField, GroupEncoding};
+use ciphersuite::group::{ff::PrimeField, GroupEncoding};
 use multiexp::BatchVerifier;
 
 use crate::{
@@ -195,7 +195,7 @@ impl<C: Curve> Writable for SignatureShare<C> {
 #[cfg(any(test, feature = "tests"))]
 impl<C: Curve> SignatureShare<C> {
   pub(crate) fn invalidate(&mut self) {
-    use group::ff::Field;
+    use ciphersuite::group::ff::Field;
 
     self.0 += C::F::one();
   }

crypto/frost/src/tests/nonces.rs

@@ -7,7 +7,7 @@ use rand_chacha::ChaCha20Rng;
 
 use transcript::{Transcript, RecommendedTranscript};
 
-use group::{ff::Field, Group, GroupEncoding};
+use ciphersuite::group::{ff::Field, Group, GroupEncoding};
 
 use dleq::MultiDLEqProof;
 pub use dkg::tests::{key_gen, recover_key};

crypto/frost/src/tests/vectors.rs

@@ -9,7 +9,7 @@ use zeroize::Zeroizing;
 use rand_core::{RngCore, CryptoRng, SeedableRng};
 use rand_chacha::ChaCha20Rng;
 
-use group::{ff::PrimeField, GroupEncoding};
+use ciphersuite::group::{ff::PrimeField, GroupEncoding};
 
 use crate::{
   curve::Curve,