From a1c292cb2e1e130773863f1fc45fb773ac968cf6 Mon Sep 17 00:00:00 2001 From: tyshko-rostyslav <122977916+tyshko-rostyslav@users.noreply.github.com> Date: Thu, 24 Aug 2023 20:05:14 +0200 Subject: [PATCH] add new path arg (#207) --- rln-cli/src/commands.rs | 2 ++ rln-cli/src/main.rs | 6 +++--- rln-cli/src/state.rs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rln-cli/src/commands.rs b/rln-cli/src/commands.rs index abb3267..f994683 100644 --- a/rln-cli/src/commands.rs +++ b/rln-cli/src/commands.rs @@ -15,6 +15,8 @@ pub(crate) enum Commands { /// Sets a custom config file #[arg(short, long)] config: PathBuf, + #[arg(short, long)] + tree_config_input: PathBuf, }, SetTree { tree_height: usize, diff --git a/rln-cli/src/main.rs b/rln-cli/src/main.rs index 699b3bb..e2aafee 100644 --- a/rln-cli/src/main.rs +++ b/rln-cli/src/main.rs @@ -1,4 +1,3 @@ -use std::io::Cursor; use std::{fs::File, io::Read, path::Path}; use clap::Parser; @@ -35,6 +34,7 @@ fn main() -> Result<()> { Some(Commands::NewWithParams { tree_height, config, + tree_config_input, }) => { let mut resources: Vec> = Vec::new(); for filename in ["rln.wasm", "rln_final.zkey", "verification_key.json"] { @@ -45,13 +45,13 @@ fn main() -> Result<()> { file.read_exact(&mut buffer)?; resources.push(buffer); } + let tree_config_input_file = File::open(&tree_config_input)?; state.rln = Some(RLN::new_with_params( *tree_height, resources[0].clone(), resources[1].clone(), resources[2].clone(), - // TODO: use appropriate tree_config - Cursor::new(""), + tree_config_input_file, )?); Ok(()) } diff --git a/rln-cli/src/state.rs b/rln-cli/src/state.rs index 1da3a61..b0986d7 100644 --- a/rln-cli/src/state.rs +++ b/rln-cli/src/state.rs @@ -2,7 +2,7 @@ use color_eyre::Result; use rln::public::RLN; use std::fs::File; -use crate::config::{InnerConfig, Config}; +use crate::config::{Config, InnerConfig}; #[derive(Default)] pub(crate) struct State<'a> {