Fixup imports for multiple protocols

src/migration_table.rs

@@ -8,21 +8,18 @@ that the credentials contain the bucket attributes, which include both
 the id and the bucket decryption key, but the table just contains the
 bucket ids.) */
 
-use cmz::*;
-use curve25519_dalek::ristretto::CompressedRistretto;
-//#[cfg(feature = "bridgeauth")]
 use aes_gcm::aead::{generic_array::GenericArray, Aead};
 use aes_gcm::{Aes128Gcm, KeyInit};
+use cmz::*;
+use curve25519_dalek::ristretto::CompressedRistretto;
 use ff::PrimeField;
 use group::{WnafBase, WnafScalar};
+use rand::RngCore;
 use sha2::Digest;
 use sha2::Sha256;
-//#[cfg(feature = "bridgeauth")]
-use rand::RngCore;
 
 use std::collections::HashMap;
 
-//#[cfg(feature = "bridgeauth")]
 #[cfg(feature = "bridgeauth")]
 use super::bridge_table;
 use super::lox_creds::{Migration, MigrationKey};

src/proto/blockage_migration.rs

@@ -34,9 +34,9 @@ and a new Lox credential to be issued:
 
 #[cfg(feature = "bridgeauth")]
 use super::super::dup_filter::SeenType;
-use super::super::scalar_u32;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
+use super::super::{scalar_u32, G};
 use super::check_blockage::MIN_TRUST_LEVEL;
 use super::errors::CredentialError;
 use super::level_up::LEVEL_INVITATIONS;
@@ -44,7 +44,6 @@ use super::level_up::LEVEL_INVITATIONS;
 use super::level_up::MAX_LEVEL;
 pub use crate::lox_creds::{Lox, Migration};
 use cmz::*;
-use curve25519_dalek::ristretto::RistrettoPoint as G;
 use group::Group;
 use rand_core::RngCore;
 use sha2::Sha512;
@@ -57,7 +56,7 @@ muCMZProtocol! { blockage_migration<min_trust_level>,
     L.bucket = M.from_bucket,
     N.bucket = M.to_bucket,
     N.trust_level = L.trust_level - (Scalar::ONE + Scalar::ONE),
-    N.blockages = L.blockages + Scalar::ONE
+    N.blockages = L.blockages + Scalar::ONE,
 }
 
 pub fn request(

src/proto/issue_invite.rs

@@ -47,14 +47,12 @@ and a new Invitation credential to be issued:
 
 #[cfg(feature = "bridgeauth")]
 use super::super::dup_filter::SeenType;
-use super::super::scalar_u32;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
+use super::super::{scalar_u32, Scalar, G};
 use super::errors::CredentialError;
 use crate::lox_creds::{BucketReachability, Invitation, Lox};
 use cmz::*;
-use curve25519_dalek::ristretto::RistrettoPoint as G;
-use curve25519_dalek::scalar::Scalar;
 use group::Group;
 use rand_core::RngCore;
 use sha2::Sha512;

src/proto/level_up.rs

@@ -39,13 +39,12 @@ and a new Lox credential to be issued:
 */
 #[cfg(feature = "bridgeauth")]
 use super::super::dup_filter::SeenType;
-use super::super::scalar_u32;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
+use super::super::{scalar_u32, G};
 use super::errors::CredentialError;
 use crate::lox_creds::{BucketReachability, Lox};
 use cmz::*;
-use curve25519_dalek::ristretto::RistrettoPoint as G;
 use group::Group;
 use rand_core::RngCore;
 use sha2::Sha512;

src/proto/redeem_invite.rs

@@ -23,15 +23,13 @@ and a new Lox credential to be issued:
 
 #[cfg(feature = "bridgeauth")]
 use super::super::dup_filter::SeenType;
-use super::super::scalar_u32;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
+use super::super::{scalar_u32, Scalar, G};
 use super::errors::CredentialError;
 use super::level_up::LEVEL_INVITATIONS;
 use crate::lox_creds::{Invitation, Lox};
 use cmz::*;
-use curve25519_dalek::ristretto::RistrettoPoint as G;
-use curve25519_dalek::scalar::Scalar;
 use group::Group;
 use rand_core::RngCore;
 use sha2::Sha512;