From cba6ef2555423742baed692c76bc896cb96374d3 Mon Sep 17 00:00:00 2001
From: ghassmo <ghxxm@protonmail.com>
Date: Wed, 13 Oct 2021 16:27:32 +0300
Subject: [PATCH] more clean up

---
 src/bin/cashierd.rs |  5 +----
 src/bin/darkfid.rs  | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/bin/cashierd.rs b/src/bin/cashierd.rs
index 5d07bb9d4..8a1f17620 100644
--- a/src/bin/cashierd.rs
+++ b/src/bin/cashierd.rs
@@ -628,9 +628,6 @@ async fn main() -> Result<()> {
 
     let rocks = Rocks::new(expand_path(&cashierd.config.database_path.clone())?.as_path())?;
 
-    // this is just an empty vector
-    let mut cashier_public_keys: Vec<jubjub::SubgroupPoint> = Vec::new();
-
     let params_paths = (
         expand_path(&cashierd.config.mint_params_path.clone())?,
         expand_path(&cashierd.config.spend_params_path.clone())?,
@@ -667,7 +664,7 @@ async fn main() -> Result<()> {
     let merkle_roots = RocksColumn::<columns::MerkleRoots>::new(rocks.clone());
     let nullifiers = RocksColumn::<columns::Nullifiers>::new(rocks);
 
-    cashier_public_keys.push(client.main_keypair.public);
+    let cashier_public_keys = vec![client.main_keypair.public];
 
     let state = Arc::new(Mutex::new(State {
         tree: CommitmentTree::empty(),
diff --git a/src/bin/darkfid.rs b/src/bin/darkfid.rs
index 8898ffc67..4f0d63043 100644
--- a/src/bin/darkfid.rs
+++ b/src/bin/darkfid.rs
@@ -479,11 +479,6 @@ async fn main() -> Result<()> {
     let args = clap_app!(darkfid =>
         (@arg CONFIG: -c --config +takes_value "Sets a custom config file")
         (@arg verbose: -v --verbose "Increase verbosity")
-        //(@subcommand cashier =>
-        //    (about: "Manage cashier public key")
-        //    (@arg GETCASHIERKEY: --get "Get cashier public key")
-        //    (@arg SETCASHIERKEY: --set +takes_value "Sets cashier public key")
-        //)
     )
     .get_matches();
 
@@ -531,11 +526,11 @@ async fn main() -> Result<()> {
         cashier_keys.push(cashier_public);
     }
 
+    // Load trusted setup parameters
     let params_paths = (
         expand_path(&config.mint_params_path.clone())?,
         expand_path(&config.spend_params_path.clone())?,
     );
-
     let mint_params_path = params_paths.0.to_str().unwrap_or("mint.params");
     let spend_params_path = params_paths.1.to_str().unwrap_or("spend.params");
     // Auto create trusted ceremony parameters if they don't exist
@@ -547,11 +542,10 @@ async fn main() -> Result<()> {
         let params = setup_spend_prover();
         save_params(spend_params_path, &params)?;
     }
-
-    // Load trusted setup parameters
     let (mint_params, mint_pvk) = load_params(mint_params_path)?;
     let (spend_params, spend_pvk) = load_params(spend_params_path)?;
 
+
     let client = Client::new(
         rocks.clone(),
         (