cleaned up some unused import warnings

lisp/lisp.rs

@@ -1,17 +1,14 @@
 #![allow(non_snake_case)]
 
 use crate::types::LispCircuit;
-use bellman::groth16::PreparedVerifyingKey;
 
-use sapvi::{BlsStringConversion, Decodable, Encodable, ZKContract, ZKProof};
-use simplelog::*;
+use sapvi::BlsStringConversion;
 
 use bellman::groth16;
 use bls12_381::Bls12;
 // use fnv::FnvHashMap;
 use itertools::Itertools;
 use rand::rngs::OsRng;
-use std::borrow::{Borrow, BorrowMut};
 use std::rc::Rc;
 use std::time::Instant;
 use std::{cell::RefCell, collections::HashMap};

lisp/types.rs

@@ -1,11 +1,8 @@
-use bellman::{gadgets::Assignment, groth16, Circuit, ConstraintSystem, SynthesisError};
+use bellman::{groth16, Circuit, ConstraintSystem, SynthesisError};
 use sapvi::bls_extensions::BlsStringConversion;
 use std::rc::Rc;
 use std::{cell::RefCell, collections::HashMap};
-use std::{
-    ops::{Add, AddAssign, MulAssign, SubAssign},
-    time::Instant,
-};
+use std::time::Instant;
 // use fnv::FnvHashMap;
 use itertools::Itertools;
 

src/bin/compile-shaders.rs

@@ -1,8 +1,5 @@
 use anyhow::*;
-use fs_extra::copy_items;
-use fs_extra::dir::CopyOptions;
 use glob::glob;
-use std::env;
 use std::fs::{read_to_string, write};
 use std::path::PathBuf;
 

src/bin/dfg.rs

@@ -11,7 +11,7 @@ use winit::{
 
 use sapvi::gfx::{camera, model, texture};
 
-use model::{DrawLight, DrawModel, Vertex};
+use model::{DrawModel, Vertex};
 
 use std::time::Instant;
 #[macro_use]

src/bin/dfi.rs

@@ -2,19 +2,10 @@
 extern crate clap;
 use async_executor::Executor;
 use sapvi::rpc::options::ProgramOptions;
-use async_native_tls::TlsAcceptor;
-use async_std::sync::Mutex;
 use easy_parallel::Parallel;
-use http_types::{Request, Response, StatusCode};
-use log::*;
 use sapvi::rpc::jsonserver;
-use sapvi::rpc::jsonserver::RpcInterface;
-use sapvi::{net, Result};
+use sapvi::Result;
 use sapvi::rpc::adapter::RpcAdapter;
-use serde_json::json;
-use smol::Async;
-use std::net::SocketAddr;
-use std::net::TcpListener;
 use std::sync::Arc;
 
 

src/bin/mint-classic.rs

@@ -1,9 +1,5 @@
-use bellman::gadgets::multipack;
-use bellman::groth16;
-use blake2s_simd::Params as Blake2sParams;
-use bls12_381::Bls12;
 use ff::Field;
-use group::{Curve, Group, GroupEncoding};
+use group::Group;
 
 use sapvi::crypto::{
     create_mint_proof, load_params, save_params, setup_mint_prover, verify_mint_proof,
@@ -11,7 +7,6 @@ use sapvi::crypto::{
 
 fn main() {
     use rand::rngs::OsRng;
-    use std::time::Instant;
 
     let public = jubjub::SubgroupPoint::random(&mut OsRng);
 

src/bin/spend-classic.rs

@@ -1,12 +1,9 @@
 use bellman::gadgets::multipack;
-use bellman::groth16;
 use bitvec::{order::Lsb0, view::AsBits};
 use blake2s_simd::Params as Blake2sParams;
-use bls12_381::Bls12;
 use ff::{Field, PrimeField};
 use group::{Curve, GroupEncoding};
 
-use sapvi::circuit::spend_contract::SpendContract;
 use sapvi::crypto::{
     create_spend_proof, load_params, save_params, setup_spend_prover, verify_spend_proof,
 };

src/bin/tx.rs

@@ -1,22 +1,18 @@
 use bellman::groth16;
 use bls12_381::Bls12;
 use ff::{Field, PrimeField};
-use group::Group;
 use rand::rngs::OsRng;
-use std::io;
 use std::path::Path;
 
 use sapvi::crypto::{
     coin::Coin,
-    create_mint_proof, create_spend_proof, load_params,
+    load_params,
     merkle::{CommitmentTree, IncrementalWitness},
     nullifier::Nullifier,
     note::{EncryptedNote, Note},
-    save_params, setup_mint_prover, setup_spend_prover, verify_mint_proof, verify_spend_proof,
-    MintRevealedValues, SpendRevealedValues,
+    save_params, setup_mint_prover, setup_spend_prover,
 };
-use sapvi::error::{Error, Result};
-use sapvi::serial::{Decodable, Encodable, VarInt};
+use sapvi::serial::{Decodable, Encodable};
 use sapvi::state::{state_transition, ProgramState, StateUpdates};
 use sapvi::tx;
 

src/crypto/mint_proof.rs

@@ -2,14 +2,13 @@ use bellman::gadgets::multipack;
 use bellman::groth16;
 use blake2s_simd::Params as Blake2sParams;
 use bls12_381::Bls12;
-use ff::Field;
-use group::{Curve, Group, GroupEncoding};
+use group::{Curve, GroupEncoding};
 use rand::rngs::OsRng;
 use std::io;
 use std::time::Instant;
 
 use crate::circuit::mint_contract::MintContract;
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::serial::{Decodable, Encodable};
 
 pub struct MintRevealedValues {

src/crypto/schnorr.rs

@@ -1,10 +1,10 @@
 use ff::Field;
-use group::{Group, GroupEncoding};
+use group::GroupEncoding;
 use rand::rngs::OsRng;
 use std::io;
 
 use super::util::hash_to_scalar;
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::serial::{Decodable, Encodable};
 
 pub struct SecretKey(pub jubjub::Fr);

src/crypto/spend_proof.rs

@@ -1,9 +1,8 @@
 use bellman::gadgets::multipack;
 use bellman::groth16;
-use bitvec::{order::Lsb0, view::AsBits};
 use blake2s_simd::Params as Blake2sParams;
 use bls12_381::Bls12;
-use ff::{Field, PrimeField};
+use ff::PrimeField;
 use group::{Curve, GroupEncoding};
 use rand::rngs::OsRng;
 use std::io;
@@ -11,7 +10,7 @@ use std::time::Instant;
 
 use super::coin::merkle_hash;
 use crate::circuit::spend_contract::SpendContract;
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::serial::{Decodable, Encodable};
 
 pub struct SpendRevealedValues {

src/old/mimc.rs

@@ -1,5 +1,5 @@
 // For randomness (during paramgen and proof generation)
-use rand::thread_rng;
+//use rand::thread_rng;
 
 // For benchmarking
 use std::time::{Duration, Instant};
@@ -8,14 +8,14 @@ use std::time::{Duration, Instant};
 use sapvi::bls_extensions::BlsStringConversion;
 
 // Bring in some tools for using finite fiels
-use ff::{Field, PrimeField};
+use ff::PrimeField;
 
 // mimc constants
 //mod mimc_constants;
 //use mimc_constants::mimc_constants;
 
 // We're going to use the BLS12-381 pairing-friendly elliptic curve.
-use bls12_381::{Bls12, Scalar};
+use bls12_381::Bls12;
 
 // We'll use these interfaces to construct our circuit.
 use bellman::{Circuit, ConstraintSystem, SynthesisError};

src/rpc/adapter.rs

@@ -1,10 +1,5 @@
 // Adapter class goes here
 //use crate::rpc::jsonserver::JsonRpcInterface;
-use crate::Result;
-use async_executor::Executor;
-use async_native_tls::TlsAcceptor;
-use smol::Async;
-use std::net::TcpListener;
 use std::sync::Arc;
 
 // Dummy adapter for now

src/rpc/jsonserver.rs

@@ -1,21 +1,12 @@
-use crate::{net, serial, Error, Result};
+use crate::{net, Error, Result};
 use crate::rpc::options::ProgramOptions;
 use crate::rpc::adapter::RpcAdapter;
 use async_executor::Executor;
 use async_native_tls::TlsAcceptor;
 use async_std::sync::Mutex;
-use easy_parallel::Parallel;
-use ff::Field;
 use http_types::{Request, Response, StatusCode};
 use log::*;
-use rand::rngs::OsRng;
-use rusqlite::Connection;
-use serde_json::json;
 use smol::Async;
-use std::fs::File;
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::net::SocketAddr;
 use std::net::TcpListener;
 use std::sync::Arc;
 

src/rpc/options.rs

@@ -1,15 +1,6 @@
 #[macro_use]
 use std::net::SocketAddr;
-use crate::{net, Error, Result};
-use async_executor::Executor;
-use async_native_tls::TlsAcceptor;
-use async_std::sync::Mutex;
-use easy_parallel::Parallel;
-use http_types::{Request, Response, StatusCode};
-use log::*;
-use smol::Async;
-use std::net::TcpListener;
-use std::sync::Arc;
+use crate::{net, Result};
 
 pub struct ProgramOptions {
     pub network_settings: net::Settings,

src/state.rs

@@ -2,7 +2,7 @@ use bellman::groth16;
 use bls12_381::Bls12;
 use std::fmt;
 
-use crate::{crypto::{coin::Coin, note::{EncryptedNote, Note}, nullifier::Nullifier}, error::{Error, Result}, tx};
+use crate::{crypto::{coin::Coin, note::EncryptedNote, nullifier::Nullifier}, tx};
 
 pub trait ProgramState {
     fn is_valid_cashier_public_key(&self, public: &jubjub::SubgroupPoint) -> bool;

src/tx/builder.rs

@@ -1,21 +1,11 @@
 use bellman::groth16;
 use bls12_381::Bls12;
 use rand::rngs::OsRng;
-use std::collections::HashMap;
-use std::io;
 use ff::Field;
 
-use crate::error::{Error, Result};
-use crate::serial::{Decodable, Encodable, VarInt};
+use crate::serial::Encodable;
 use super::{TransactionClearInput, TransactionInput, TransactionOutput, Transaction, partial::{PartialTransactionClearInput, PartialTransactionInput, PartialTransaction}};
-use crate::crypto::{
-    coin::Coin,
-    create_mint_proof, create_spend_proof, load_params,
-    merkle::CommitmentTree,
-    note::{EncryptedNote, Note},
-    save_params, schnorr, setup_mint_prover, setup_spend_prover, verify_mint_proof,
-    verify_spend_proof, MintRevealedValues, SpendRevealedValues,
-};
+use crate::crypto::{create_spend_proof, create_mint_proof, note::Note, schnorr};
 
 pub struct TransactionBuilder {
     pub clear_inputs: Vec<TransactionBuilderClearInputInfo>,

src/tx/mod.rs

@@ -3,21 +3,15 @@ pub mod partial;
 
 use bellman::groth16;
 use bls12_381::Bls12;
-use ff::Field;
 use group::Group;
-use rand::rngs::OsRng;
-use std::collections::HashMap;
 use std::io;
 
 use crate::crypto::{
-    coin::Coin,
-    create_mint_proof, create_spend_proof, load_params,
-    merkle::CommitmentTree,
-    note::{EncryptedNote, Note},
-    save_params, schnorr, setup_mint_prover, setup_spend_prover, verify_mint_proof,
+    note::EncryptedNote,
+    schnorr, verify_mint_proof,
     verify_spend_proof, MintRevealedValues, SpendRevealedValues,
 };
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::impl_vec;
 use crate::serial::{Decodable, Encodable, VarInt};
 use crate::state;

src/tx/partial.rs

@@ -1,22 +1,12 @@
 use bellman::groth16;
 use bls12_381::Bls12;
-use rand::rngs::OsRng;
-use std::collections::HashMap;
 use std::io;
-use ff::Field;
 
-use crate::error::{Error, Result};
+use crate::error::Result;
 use crate::impl_vec;
 use crate::serial::{Decodable, Encodable, VarInt};
-use super::{TransactionClearInput, TransactionInput, TransactionOutput, Transaction};
-use crate::crypto::{
-    coin::Coin,
-    create_mint_proof, create_spend_proof, load_params,
-    merkle::CommitmentTree,
-    note::{EncryptedNote, Note},
-    save_params, schnorr, setup_mint_prover, setup_spend_prover, verify_mint_proof,
-    verify_spend_proof, MintRevealedValues, SpendRevealedValues,
-};
+use super::TransactionOutput;
+use crate::crypto::SpendRevealedValues;
 
 pub struct PartialTransaction {
     pub clear_inputs: Vec<PartialTransactionClearInput>,
@@ -63,8 +53,7 @@ impl Encodable for PartialTransactionClearInput {
         len += self.signature_public.encode(&mut s)?;
         Ok(len)
     }
-}
-
+} 
 impl Decodable for PartialTransactionClearInput {
     fn decode<D: io::Read>(mut d: D) -> Result<Self> {
         Ok(Self {