Have Ciphersuite re-export Group

crypto/schnorr/Cargo.toml

@@ -19,9 +19,8 @@ zeroize = { version = "^1.5", features = ["zeroize_derive"] }
 
 transcript = { package = "flexible-transcript", path = "../transcript", version = "0.2" }
 
-group = "0.12"
-multiexp = { path = "../multiexp", version = "0.2", features = ["batch"] }
 ciphersuite = { path = "../ciphersuite", version = "0.1" }
+multiexp = { path = "../multiexp", version = "0.2", features = ["batch"] }
 
 [dev-dependencies]
 hex = "0.4"

crypto/schnorr/src/aggregate.rs

@@ -4,12 +4,14 @@ use zeroize::Zeroize;
 
 use transcript::{Transcript, SecureDigest, DigestTranscript};
 
-use group::{
-  ff::{Field, PrimeField},
-  Group, GroupEncoding,
+use ciphersuite::{
+  group::{
+    ff::{Field, PrimeField},
+    Group, GroupEncoding,
+  },
+  Ciphersuite,
 };
 use multiexp::multiexp_vartime;
-use ciphersuite::Ciphersuite;
 
 use crate::SchnorrSignature;
 

crypto/schnorr/src/lib.rs

@@ -5,15 +5,15 @@ use rand_core::{RngCore, CryptoRng};
 
 use zeroize::{Zeroize, Zeroizing};
 
-use group::{
-  ff::{Field, PrimeField},
-  Group, GroupEncoding,
+use ciphersuite::{
+  group::{
+    ff::{Field, PrimeField},
+    Group, GroupEncoding,
+  },
+  Ciphersuite,
 };
-
 use multiexp::{multiexp_vartime, BatchVerifier};
 
-use ciphersuite::Ciphersuite;
-
 pub mod aggregate;
 
 #[cfg(test)]

crypto/schnorr/src/tests/mod.rs

@@ -3,11 +3,12 @@ use core::ops::Deref;
 use zeroize::Zeroizing;
 use rand_core::OsRng;
 
-use group::{ff::Field, Group};
+use ciphersuite::{
+  group::{ff::Field, Group},
+  Ciphersuite, Ed25519,
+};
 use multiexp::BatchVerifier;
 
-use ciphersuite::{Ciphersuite, Ed25519};
-
 use crate::{
   SchnorrSignature,
   aggregate::{SchnorrAggregator, SchnorrAggregate},

crypto/schnorr/src/tests/rfc8032.rs

@@ -5,9 +5,8 @@
 
 use sha2::{Digest, Sha512};
 
-use group::GroupEncoding;
 use dalek_ff_group::Scalar;
-use ciphersuite::{Ciphersuite, Ed25519};
+use ciphersuite::{group::GroupEncoding, Ciphersuite, Ed25519};
 
 use crate::SchnorrSignature;