Have Ciphersuite re-export Group

crypto/dkg/Cargo.toml

@@ -24,9 +24,8 @@ serde = { version = "1", features = ["derive"], optional = true }
 transcript = { package = "flexible-transcript", path = "../transcript", version = "0.2", features = ["recommended"] }
 chacha20 = { version = "0.9", features = ["zeroize"] }
 
-group = "0.12"
-multiexp = { path = "../multiexp", version = "0.2", features = ["batch"] }
 ciphersuite = { path = "../ciphersuite", version = "0.1", features = ["std"] }
+multiexp = { path = "../multiexp", version = "0.2", features = ["batch"] }
 
 schnorr = { package = "schnorr-signatures", path = "../schnorr", version = "0.2" }
 dleq = { path = "../dleq", version = "0.2", features = ["serialize"] }

crypto/dkg/src/encryption.rs

@@ -17,9 +17,8 @@ use chacha20::{
 use transcript::{Transcript, RecommendedTranscript};
 
 #[cfg(test)]
-use group::ff::Field;
-use group::GroupEncoding;
-use ciphersuite::Ciphersuite;
+use ciphersuite::group::ff::Field;
+use ciphersuite::{group::GroupEncoding, Ciphersuite};
 use multiexp::BatchVerifier;
 
 use schnorr::SchnorrSignature;
@@ -222,7 +221,7 @@ impl<C: Ciphersuite, E: Encryptable> EncryptedMessage<C, E> {
     from: Participant,
     to: C::G,
   ) {
-    use group::ff::PrimeField;
+    use ciphersuite::group::ff::PrimeField;
 
     let mut repr = <C::F as PrimeField>::Repr::default();
     for b in repr.as_mut().iter_mut() {
@@ -246,7 +245,7 @@ impl<C: Ciphersuite, E: Encryptable> EncryptedMessage<C, E> {
     from: Participant,
     to: C::G,
   ) {
-    use group::ff::PrimeField;
+    use ciphersuite::group::ff::PrimeField;
 
     // Assumes the share isn't randomly 1
     let repr = C::F::one().to_repr();

crypto/dkg/src/frost.rs

@@ -10,11 +10,13 @@ use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
 
 use transcript::{Transcript, RecommendedTranscript};
 
-use group::{
-  ff::{Field, PrimeField},
-  Group, GroupEncoding,
+use ciphersuite::{
+  group::{
+    ff::{Field, PrimeField},
+    Group, GroupEncoding,
+  },
+  Ciphersuite,
 };
-use ciphersuite::Ciphersuite;
 use multiexp::{multiexp_vartime, BatchVerifier};
 
 use schnorr::SchnorrSignature;

crypto/dkg/src/lib.rs

@@ -16,13 +16,14 @@ use thiserror::Error;
 
 use zeroize::{Zeroize, Zeroizing};
 
-use group::{
-  ff::{Field, PrimeField},
-  GroupEncoding,
+use ciphersuite::{
+  group::{
+    ff::{Field, PrimeField},
+    GroupEncoding,
+  },
+  Ciphersuite,
 };
 
-use ciphersuite::Ciphersuite;
-
 /// Encryption types and utilities used to secure DKG messages.
 pub mod encryption;
 

crypto/dkg/src/promote.rs

@@ -7,9 +7,7 @@ use std::{
 
 use rand_core::{RngCore, CryptoRng};
 
-use group::GroupEncoding;
-
-use ciphersuite::Ciphersuite;
+use ciphersuite::{group::GroupEncoding, Ciphersuite};
 
 use transcript::{Transcript, RecommendedTranscript};
 use dleq::DLEqProof;

crypto/dkg/src/tests/mod.rs

@@ -3,9 +3,7 @@ use std::collections::HashMap;
 
 use rand_core::{RngCore, CryptoRng};
 
-use group::ff::Field;
-
-use ciphersuite::Ciphersuite;
+use ciphersuite::{group::ff::Field, Ciphersuite};
 
 use crate::{Participant, ThresholdCore, ThresholdKeys, lagrange};
 

crypto/dkg/src/tests/promote.rs

@@ -5,9 +5,7 @@ use rand_core::{RngCore, CryptoRng};
 
 use zeroize::Zeroize;
 
-use group::Group;
-
-use ciphersuite::Ciphersuite;
+use ciphersuite::{group::Group, Ciphersuite};
 
 use crate::{
   promote::{GeneratorPromotion, GeneratorProof},