From 607466b94959a67f57587a7dba608bdcc3290d9a Mon Sep 17 00:00:00 2001
From: onyinyang <onyinyang@torproject.org>
Date: Thu, 22 Jun 2023 17:07:14 -0400
Subject: [PATCH] Clean up clippy fixes

---
 crates/lox-distributor/src/lox_context.rs   |  3 ++-
 crates/lox-library/src/lib.rs               | 12 +++++-------
 crates/lox-library/src/proto/open_invite.rs |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/lox-distributor/src/lox_context.rs b/crates/lox-distributor/src/lox_context.rs
index 1dcec82..7aa402e 100644
--- a/crates/lox-distributor/src/lox_context.rs
+++ b/crates/lox-distributor/src/lox_context.rs
@@ -8,7 +8,6 @@ use lox_library::{
     },
     BridgeAuth, BridgeDb, IssuerPubKey,
 };
-use lox_utils;
 use std::{sync::{Arc, Mutex}, collections::HashMap};
 use zkp::ProofError;
 
@@ -79,11 +78,13 @@ impl LoxServerContext {
         result
     }
 
+/* Uncomment when bridge blocking is finalized
     pub fn add_unreachable(&self, bridgeline: BridgeLine) -> bool {
         let mut ba_obj = self.ba.lock().unwrap();
         let mut db_obj = self.db.lock().unwrap();
         ba_obj.bridge_unreachable(&bridgeline, &mut db_obj)
     }
+*/
 
     pub fn update_bridge(&self, bridgeline: BridgeLine) -> bool {
         let mut ba_obj = self.ba.lock().unwrap();
diff --git a/crates/lox-library/src/lib.rs b/crates/lox-library/src/lib.rs
index 7195b09..34c546c 100644
--- a/crates/lox-library/src/lib.rs
+++ b/crates/lox-library/src/lib.rs
@@ -300,8 +300,7 @@ impl BridgeAuth {
         bridges: [BridgeLine; MAX_BRIDGES_PER_BUCKET],
         bdb: &mut BridgeDb,
     ) {
-        let bnum: u32;
-        bnum = self.bridge_table.new_bucket(&bridges);
+        let bnum = self.bridge_table.new_bucket(&bridges);
         let mut single = [BridgeLine::default(); MAX_BRIDGES_PER_BUCKET];
         for b in bridges.iter() {
             single[0] = *b;
@@ -313,8 +312,7 @@ impl BridgeAuth {
 
     /// Insert a hot spare bucket of bridges
     pub fn add_spare_bucket(&mut self, bucket: [BridgeLine; MAX_BRIDGES_PER_BUCKET]) {
-        let bnum: u32;
-        bnum = self.bridge_table.new_bucket(&bucket);
+        let bnum = self.bridge_table.new_bucket(&bucket);
         self.bridge_table.spares.insert(bnum);
     }
 
@@ -468,7 +466,7 @@ impl BridgeAuth {
                         }
                     }
                     for (bucketnum, offset) in positions.iter() {
-                        let mut bridgelines = match self.bridge_table.buckets.get(&bucketnum) {
+                        let mut bridgelines = match self.bridge_table.buckets.get(bucketnum) {
                             Some(bridgelines) => *bridgelines,
                             None => return ReplaceSuccess::NotReplaced,
                         };
@@ -493,7 +491,7 @@ impl BridgeAuth {
             }
             None => return res,
         };
-        return res;
+        res
     }
 
     /// Mark a bridge as unreachable
@@ -526,7 +524,7 @@ impl BridgeAuth {
             if let Some(v) = positions {
                 for (bucketnum, offset) in v.iter() {
                     // Count how many bridges in this bucket are reachable
-                    let mut bucket = match self.bridge_table.buckets.get(&bucketnum) {
+                    let mut bucket = match self.bridge_table.buckets.get(bucketnum) {
                         Some(bridgelines) => *bridgelines,
                         None => return false,
                     };
diff --git a/crates/lox-library/src/proto/open_invite.rs b/crates/lox-library/src/proto/open_invite.rs
index f54b575..5b66333 100644
--- a/crates/lox-library/src/proto/open_invite.rs
+++ b/crates/lox-library/src/proto/open_invite.rs
@@ -197,7 +197,7 @@ impl BridgeAuth {
         // Create the bucket attribute (Scalar), which is a combination
         // of the bucket id (u32) and the bucket's decryption key ([u8; 16])
         let bucket_key = self.bridge_table.keys.get(&bucket_id_u32).unwrap();
-        let bucket: Scalar = bridge_table::to_scalar(bucket_id_u32, &bucket_key);
+        let bucket: Scalar = bridge_table::to_scalar(bucket_id_u32, bucket_key);
         let bridge_lines = self.bridge_table.buckets.get(&bucket_id_u32).unwrap();
         let bridge_line = bridge_lines[0];