fix: various warnings

deltadevsde · Jul 14, 2024 · bfcb1cc · bfcb1cc
1 parent 2d11b7b
commit bfcb1cc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/src/cfg.rs b/src/cfg.rs
@@ -72,7 +72,6 @@ pub struct Config {
 }
 
 #[derive(Debug, Default, Clone, Eq, PartialEq, Serialize, Deserialize)]
-#[cfg_attr(feature = "serde", derive(SerializeDisplay, DeserializeFromStr))]
 pub enum DALayerOption {
     #[default]
     Celestia,

diff --git a/src/storage.rs b/src/storage.rs
@@ -474,22 +474,22 @@ impl Database for RedisConnections {
         let mut commitments_conn = self.lock_connection(&self.commitments)?;
 
         redis::cmd("FLUSHALL")
-            .query(&mut main_conn)
+            .query::<()>(&mut main_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all entries in main dict")))?;
         redis::cmd("FLUSHALL")
-            .query(&mut derived_conn)
+            .query::<()>(&mut derived_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all entries in derived dict")))?;
         redis::cmd("FLUSHALL")
-            .query(&mut input_order_conn)
+            .query::<()>(&mut input_order_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all entries in input order")))?;
         redis::cmd("FLUSHALL")
-            .query(&mut app_state_conn)
+            .query::<()>(&mut app_state_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all entries in app state")))?;
         redis::cmd("FLUSHALL")
-            .query(&mut merkle_proof_conn)
+            .query::<()>(&mut merkle_proof_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all merkle proofs")))?;
         redis::cmd("FLUSHALL")
-            .query(&mut commitments_conn)
+            .query::<()>(&mut commitments_conn)
             .map_err(|_| DatabaseError::DeleteError(format!("all commitments")))?;
         Ok(())
     }

diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -3,14 +3,9 @@ use std::time::{Duration, Instant};
 // use deimos::zk_snark::BatchMerkleProofCircuit;
 use bellman::groth16;
 use bls12_381::Bls12;
-use deimos::{
-    error::{DeimosError, GeneralError, ProofError},
-    storage::{ChainEntry, Operation},
-    utils::validate_epoch,
-    zk_snark::{hex_to_scalar, BatchMerkleProofCircuit, InsertMerkleProofCircuit},
-};
+use deimos::{utils::validate_epoch, zk_snark::BatchMerkleProofCircuit};
 use indexed_merkle_tree::{
-    node::{self, Node},
+    node::Node,
     sha256,
     tree::{IndexedMerkleTree, Proof},
 };
@@ -25,7 +20,7 @@ fn generate_test_tree(size: usize, node_count: usize) -> Duration {
     let mut proofs = Vec::with_capacity(node_count);
     let mut insertion_times: Vec<Duration> = Vec::with_capacity(node_count);
     for i in 0..node_count {
-        let leaf = Node::new_leaf(
+        let mut leaf = Node::new_leaf(
             true,
             true,
             (i + 1).to_string(),
@@ -34,7 +29,7 @@ fn generate_test_tree(size: usize, node_count: usize) -> Duration {
         );
 
         let start = Instant::now();
-        let proof = tree.insert_node(&leaf).unwrap();
+        let proof = tree.insert_node(&mut leaf).unwrap();
         let end = Instant::now();
         insertion_times.push(end.duration_since(start));
         proofs.push(Proof::Insert(proof))