github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

more clean up

Browse Source
This commit is contained in:
ghassmo
2021-10-13 16:27:32 +03:00
parent b974aa4663
commit cba6ef2555
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/cashierd.rs
View File

@@ -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(),

10
src/bin/darkfid.rs
View File

@@ -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(),
(