Remove not explicit use statement (#317)

Author: sydhds

rln/Cargo.toml

@@ -67,7 +67,7 @@ criterion = { version = "0.6.0", features = ["html_reports"] }
 
 [features]
 default = ["pmtree-ft"]
-fullmerkletree = ["default"]
+fullmerkletree = []
 stateless = []
 arkzkey = []
 

rln/src/pm_tree_adapter.rs

@@ -9,7 +9,7 @@ use crate::utils::{bytes_le_to_fr, fr_to_bytes_le};
 use utils::error::{FromConfigError, ZerokitMerkleTreeError};
 use utils::pmtree::tree::Key;
 use utils::pmtree::{Database, Hasher, PmtreeErrorKind};
-use utils::*;
+use utils::{pmtree, Config, Mode, SledDB, ZerokitMerkleProof, ZerokitMerkleTree};
 
 const METADATA_KEY: [u8; 8] = *b"metadata";
 

rln/src/poseidon_tree.rs

@@ -4,26 +4,33 @@
 
 use cfg_if::cfg_if;
 
-cfg_if! {
-    if #[cfg(feature = "pmtree-ft")] {
-        use crate::pm_tree_adapter::*;
-    } else {
-        use crate::hashers::{PoseidonHash};
-        use utils::merkle_tree::*;
-    }
-}
-
 // The zerokit RLN default Merkle tree implementation is the OptimalMerkleTree.
 // To switch to FullMerkleTree implementation, it is enough to enable the fullmerkletree feature
 
 cfg_if! {
     if #[cfg(feature = "fullmerkletree")] {
+
+        use utils::{
+            FullMerkleTree,
+            FullMerkleProof,
+        };
+        use crate::hashers::PoseidonHash;
+
         pub type PoseidonTree = FullMerkleTree<PoseidonHash>;
         pub type MerkleProof = FullMerkleProof<PoseidonHash>;
     } else if #[cfg(feature = "pmtree-ft")] {
+        use crate::pm_tree_adapter::{PmTree, PmTreeProof};
+
         pub type PoseidonTree =  PmTree;
         pub type MerkleProof = PmTreeProof;
     } else {
+
+        use crate::hashers::{PoseidonHash};
+        use utils::{
+            OptimalMerkleTree,
+            OptimalMerkleProof,
+        };
+
         pub type PoseidonTree = OptimalMerkleTree<PoseidonHash>;
         pub type MerkleProof = OptimalMerkleProof<PoseidonHash>;
     }

rln/src/protocol.rs

@@ -17,9 +17,12 @@ use tiny_keccak::{Hasher as _, Keccak};
 use crate::circuit::{calculate_rln_witness, qap::CircomReduction, Curve};
 use crate::error::{ComputeIdSecretError, ConversionError, ProofError, ProtocolError};
 use crate::hashers::{hash_to_field, poseidon_hash};
-use crate::poseidon_tree::*;
+use crate::poseidon_tree::{MerkleProof, PoseidonTree};
 use crate::public::RLN_IDENTIFIER;
-use crate::utils::*;
+use crate::utils::{
+    bytes_le_to_fr, bytes_le_to_vec_fr, bytes_le_to_vec_u8, fr_byte_size, fr_to_bytes_le,
+    normalize_usize, to_bigint, vec_fr_to_bytes_le, vec_u8_to_bytes_le,
+};
 use utils::{ZerokitMerkleProof, ZerokitMerkleTree};
 ///////////////////////////////////////////////////////
 // RLN Witness data structure and utility functions

rln/src/public.rs

@@ -1,3 +1,24 @@
+use crate::circuit::{zkey_from_raw, Curve, Fr};
+use crate::hashers::{hash_to_field, poseidon_hash as utils_poseidon_hash};
+use crate::protocol::{
+    compute_id_secret, deserialize_proof_values, deserialize_witness, extended_keygen,
+    extended_seeded_keygen, generate_proof, keygen, proof_inputs_to_rln_witness,
+    proof_values_from_witness, rln_witness_to_bigint_json, rln_witness_to_json, seeded_keygen,
+    serialize_proof_values, serialize_witness, verify_proof,
+};
+use crate::utils::{
+    bytes_le_to_fr, bytes_le_to_vec_fr, bytes_le_to_vec_u8, fr_byte_size, fr_to_bytes_le,
+    vec_fr_to_bytes_le, vec_u8_to_bytes_le,
+};
+#[cfg(not(target_arch = "wasm32"))]
+use {
+    crate::circuit::{graph_from_folder, zkey_from_folder},
+    std::default::Default,
+};
+
+#[cfg(target_arch = "wasm32")]
+use crate::protocol::generate_proof_with_witness;
+
 /// This is the main public API for RLN module. It is used by the FFI, and should be
 /// used by tests etc. as well
 #[cfg(not(feature = "stateless"))]
@@ -8,16 +29,6 @@ use {
     utils::{Hasher, ZerokitMerkleProof, ZerokitMerkleTree},
 };
 
-use crate::circuit::{zkey_from_raw, Curve, Fr};
-use crate::hashers::{hash_to_field, poseidon_hash as utils_poseidon_hash};
-use crate::protocol::*;
-use crate::utils::*;
-#[cfg(not(target_arch = "wasm32"))]
-use {
-    crate::circuit::{graph_from_folder, zkey_from_folder},
-    std::default::Default,
-};
-
 use crate::error::{ConversionError, ProtocolError, RLNError};
 use ark_groth16::{Proof as ArkProof, ProvingKey, VerifyingKey};
 use ark_relations::r1cs::ConstraintMatrices;

rln/src/public_api_tests.rs

@@ -1,7 +1,10 @@
 use crate::circuit::TEST_TREE_HEIGHT;
-use crate::protocol::*;
+use crate::protocol::{
+    proof_values_from_witness, random_rln_witness, serialize_proof_values, serialize_witness,
+    verify_proof, RLNProofValues,
+};
 use crate::public::RLN;
-use crate::utils::*;
+use crate::utils::{generate_input_buffer, str_to_fr};
 use ark_groth16::Proof as ArkProof;
 use ark_serialize::CanonicalDeserialize;
 use std::io::Cursor;

rln/tests/ffi.rs

@@ -3,7 +3,7 @@
 mod test {
     use ark_std::{rand::thread_rng, UniformRand};
     use rand::Rng;
-    use rln::circuit::*;
+    use rln::circuit::{Fr, TEST_TREE_HEIGHT};
     use rln::ffi::{hash as ffi_hash, poseidon_hash as ffi_poseidon_hash, *};
     use rln::hashers::{hash_to_field, poseidon_hash as utils_poseidon_hash, ROUND_PARAMS};
     use rln::protocol::*;

rln/tests/poseidon_tree.rs

@@ -5,7 +5,10 @@
 #[cfg(test)]
 mod test {
     use rln::hashers::{poseidon_hash, PoseidonHash};
-    use rln::{circuit::*, poseidon_tree::PoseidonTree};
+    use rln::{
+        circuit::{Fr, TEST_TREE_HEIGHT},
+        poseidon_tree::PoseidonTree,
+    };
     use utils::{FullMerkleTree, OptimalMerkleTree, ZerokitMerkleProof, ZerokitMerkleTree};
 
     #[test]

rln/tests/protocol.rs

@@ -5,7 +5,12 @@ mod test {
     use rln::circuit::{Fr, TEST_TREE_HEIGHT};
     use rln::hashers::{hash_to_field, poseidon_hash};
     use rln::poseidon_tree::PoseidonTree;
-    use rln::protocol::*;
+    use rln::protocol::{
+        deserialize_proof_values, deserialize_witness, generate_proof, keygen,
+        proof_values_from_witness, rln_witness_from_json, rln_witness_from_values,
+        rln_witness_to_json, seeded_keygen, serialize_proof_values, serialize_witness,
+        verify_proof, RLNWitnessInput,
+    };
     use rln::utils::str_to_fr;
     use utils::{ZerokitMerkleProof, ZerokitMerkleTree};
 

rln/tests/public.rs

@@ -12,7 +12,10 @@ mod test {
     use rln::hashers::{hash_to_field, poseidon_hash as utils_poseidon_hash, ROUND_PARAMS};
     use rln::protocol::deserialize_identity_tuple;
     use rln::public::{hash as public_hash, poseidon_hash as public_poseidon_hash, RLN};
-    use rln::utils::*;
+    use rln::utils::{
+        bytes_le_to_fr, bytes_le_to_vec_fr, bytes_le_to_vec_u8, bytes_le_to_vec_usize,
+        fr_to_bytes_le, generate_input_buffer, str_to_fr, vec_fr_to_bytes_le,
+    };
     use std::io::Cursor;
 
     #[test]