Remove unnecessary attribute initialization

src/mock_auth.rs

@@ -1,6 +1,6 @@
 #[cfg(all(test, feature = "bridgeauth"))]
 use super::proto::{
-    check_blockage, issue_invite,
+    blockage_migration, check_blockage, issue_invite,
     level_up::{self, LEVEL_INTERVAL},
     migration, open_invite,
     trust_promotion::{self, UNTRUSTED_INTERVAL},
@@ -303,6 +303,30 @@ impl TestHarness {
         assert!(mig_cred.is_ok(), "Handle response should succeed");
         mig_cred.unwrap()
     }
+
+    pub fn blockage_migration(
+        &mut self,
+        rng: &mut (impl CryptoRng + RngCore),
+        cred: Lox,
+        mig_cred: Migration,
+    ) -> Lox {
+        let migration_request =
+            blockage_migration::request(rng, cred, mig_cred, self.ba.lox_pub.clone());
+        assert!(
+            migration_request.is_ok(),
+            "Migration request should succeed"
+        );
+        let (mig_request, mig_client_state) = migration_request.unwrap();
+        let migration_response = self.ba.handle_blockage_migration(mig_request);
+        assert!(
+            migration_response.is_ok(),
+            "Migration response from server should succeed"
+        );
+        let response = migration_response.unwrap();
+        let new_cred = blockage_migration::handle_response(mig_client_state, response);
+        assert!(new_cred.is_ok(), "Handle response should succeed");
+        new_cred.unwrap()
+    }
 }
 
 /// Create a random BridgeLine for testing

src/proto/check_blockage.rs

@@ -195,7 +195,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/issue_invite.rs

@@ -130,7 +130,6 @@ pub fn request(
     I.blockages = L.blockages;
 
     let mut N: Lox = Lox::using_pubkey(&lox_pubkeys);
-    N.id = Some(Scalar::random(rng));
     N.bucket = L.bucket;
     N.trust_level = L.trust_level;
     N.level_since = L.level_since;
@@ -195,7 +194,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/level_up.rs

@@ -41,7 +41,7 @@ and a new Lox credential to be issued:
 use super::super::dup_filter::SeenType;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
-use super::super::{scalar_u32, Scalar, G};
+use super::super::{scalar_u32, G};
 use super::errors::CredentialError;
 use crate::lox_creds::{BucketReachability, Lox};
 use cmz::*;
@@ -187,10 +187,8 @@ pub fn request(
         trust_level
     };
     let mut N = Lox::using_pubkey(&pubkeys);
-    N.id = Some(Scalar::random(rng));
     N.bucket = L.bucket;
     N.trust_level = Some(new_level.into());
-    N.level_since = Some(today.into());
     N.invites_remaining = Some(LEVEL_INVITATIONS[trust_level as usize].into());
     N.blockages = L.blockages;
     let eligibility_max_age = today - (LEVEL_INTERVAL[trust_level as usize]);
@@ -274,7 +272,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/migration.rs

@@ -84,10 +84,8 @@ pub fn request(
     }
 
     let mut N = Lox::using_pubkey(&pubkeys);
-    N.id = Some(Scalar::random(rng));
     N.bucket = M.to_bucket;
     N.trust_level = Some(Scalar::ONE);
-    N.level_since = Some(Scalar::ZERO);
     N.invites_remaining = Some(Scalar::ZERO);
     N.blockages = Some(Scalar::ZERO);
 
@@ -160,7 +158,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/open_invite.rs

@@ -42,10 +42,7 @@ pub fn request(
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
 
     let mut L = Lox::using_pubkey(&pubkeys);
-    L.id = Some(Scalar::random(rng));
-    L.bucket = Some(Scalar::ZERO);
     L.trust_level = Some(Scalar::ZERO);
-    L.level_since = Some(Scalar::ZERO);
     L.invites_remaining = Some(Scalar::ZERO);
     L.blockages = Some(Scalar::ZERO);
     match open_invitation::prepare(rng, SESSION_ID, L) {
@@ -159,7 +156,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/redeem_invite.rs

@@ -86,10 +86,8 @@ pub fn request(
     };
 
     let mut N = Lox::using_pubkey(&lox_pubkeys);
-    N.id = Some(Scalar::random(rng));
     N.bucket = I.bucket;
     N.trust_level = Some(Scalar::ONE);
-    N.level_since = Some(today.into());
     N.invites_remaining = Some(LEVEL_INVITATIONS[1].into());
     N.blockages = I.blockages;
 
@@ -152,7 +150,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
     use crate::proto::redeem_invite;
 

src/proto/trust_promotion.rs

@@ -196,7 +196,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
 
     #[test]

src/proto/update_cred.rs

@@ -29,7 +29,7 @@ and a new Lox credential to be issued:
 use super::super::dup_filter::SeenType;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
-use super::super::{Scalar, G};
+use super::super::G;
 use super::errors::CredentialError;
 use crate::lox_creds::Lox;
 use cmz::*;
@@ -56,7 +56,6 @@ pub fn request(
 ) -> Result<(update_cred::Request, update_cred::ClientState), CredentialError> {
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
     let mut N: Lox = Lox::using_pubkey(&pubkeys);
-    N.id = Some(Scalar::random(rng));
     N.bucket = L.bucket;
     N.trust_level = L.trust_level;
     N.level_since = L.level_since;
@@ -154,7 +153,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
     use crate::proto::update_cred;
 

src/proto/update_invite.rs

@@ -23,7 +23,7 @@ and a new Invitation credential to be issued:
 use super::super::dup_filter::SeenType;
 #[cfg(feature = "bridgeauth")]
 use super::super::BridgeAuth;
-use super::super::{Scalar, G};
+use super::super::G;
 use super::errors::CredentialError;
 use crate::lox_creds::Invitation;
 use cmz::*;
@@ -49,7 +49,6 @@ pub fn request(
     cmz_group_init(G::hash_from_bytes::<Sha512>(b"CMZ Generator A"));
 
     let mut N = Invitation::using_pubkey(&new_pubkeys);
-    N.inv_id = Some(Scalar::random(rng));
     N.date = I.date;
     N.bucket = I.bucket;
     N.blockages = I.blockages;
@@ -143,7 +142,6 @@ pub fn handle_response(
 
 #[cfg(all(test, feature = "bridgeauth"))]
 mod tests {
-    use super::*;
     use crate::mock_auth::TestHarness;
     use crate::proto::update_invite;