From be88a432d7ac58d02371025f909ba087d0a013c0 Mon Sep 17 00:00:00 2001 From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com> Date: Fri, 16 Jun 2023 15:49:56 +0530 Subject: [PATCH] fix(rln): tree_config parsing (#180) * fix(rln): tree_config parsing * fix(rln): clippy --- rln/src/public.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rln/src/public.rs b/rln/src/public.rs index 8199d95..c9c8525 100644 --- a/rln/src/public.rs +++ b/rln/src/public.rs @@ -80,18 +80,17 @@ impl RLN<'_> { let resources_folder = rln_config["resources_folder"] .as_str() .unwrap_or(TEST_RESOURCES_FOLDER); - let tree_config_opt = rln_config["tree_config"].as_str(); + let tree_config = rln_config["tree_config"].to_string(); let witness_calculator = circom_from_folder(resources_folder)?; let proving_key = zkey_from_folder(resources_folder)?; let verification_key = vk_from_folder(resources_folder)?; - let tree_config: ::Config = match tree_config_opt { - Some(tree_config_str) => { - ::Config::from_str(tree_config_str)? - } - None => ::Config::default(), + let tree_config: ::Config = if tree_config.is_empty() { + ::Config::default() + } else { + ::Config::from_str(&tree_config)? }; // We compute a default empty tree