fix(zk_toolbox): Use slug crate instead of self written function

Signed-off-by: Danil <[email protected]>
matter-labs · Jun 24, 2024 · bba4812 · bba4812
1 parent 8861f29
commit bba4812
Show file tree

Hide file tree

Showing 9 changed files with 281 additions and 704 deletions.
diff --git a/yarn.lock b/yarn.lock
diff --git a/zk_toolbox/Cargo.lock b/zk_toolbox/Cargo.lock
diff --git a/zk_toolbox/Cargo.toml b/zk_toolbox/Cargo.toml
@@ -29,6 +29,7 @@ types = { path = "crates/types" }
 # External dependencies
 anyhow = "1.0.82"
 clap = { version = "4.4", features = ["derive", "wrap_help"] }
+slugify-rs = "0.0.3"
 cliclack = "0.2.5"
 console = "0.15.8"
 ethers = "2.0"

diff --git a/zk_toolbox/crates/common/src/lib.rs b/zk_toolbox/crates/common/src/lib.rs
@@ -1,3 +1,7 @@
+pub use prerequisites::check_prerequisites;
+pub use prompt::{init_prompt_theme, Prompt, PromptConfirm, PromptSelect};
+pub use term::{logger, spinner};
+
 pub mod cmd;
 pub mod config;
 pub mod db;
@@ -7,11 +11,5 @@ pub mod files;
 pub mod forge;
 mod prerequisites;
 mod prompt;
-mod slugify;
 mod term;
 pub mod wallets;
-
-pub use prerequisites::check_prerequisites;
-pub use prompt::{init_prompt_theme, Prompt, PromptConfirm, PromptSelect};
-pub use slugify::slugify;
-pub use term::{logger, spinner};
diff --git a/zk_toolbox/crates/common/src/slugify.rs b/zk_toolbox/crates/common/src/slugify.rs
diff --git a/zk_toolbox/crates/zk_inception/Cargo.toml b/zk_toolbox/crates/zk_inception/Cargo.toml
@@ -31,3 +31,4 @@ strum.workspace = true
 toml.workspace = true
 url.workspace = true
 thiserror.workspace = true
+slugify-rs.workspace = true
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/create.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/create.rs
@@ -1,8 +1,9 @@
 use std::{path::PathBuf, str::FromStr};
 
 use clap::Parser;
-use common::{slugify, Prompt, PromptConfirm, PromptSelect};
+use common::{Prompt, PromptConfirm, PromptSelect};
 use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
 use strum::IntoEnumIterator;
 use strum_macros::{Display, EnumIter};
 use types::{BaseToken, L1BatchCommitDataGeneratorMode, L1Network, ProverMode, WalletCreation};
@@ -26,7 +27,7 @@ use crate::{
 pub struct ChainCreateArgs {
     #[arg(long)]
     pub chain_name: Option<String>,
-    #[arg(value_parser = clap::value_parser!(u32).range(1..))]
+    #[arg(value_parser = clap::value_parser ! (u32).range(1..))]
     pub chain_id: Option<u32>,
     #[clap(long, help = MSG_PROVER_MODE_HELP, value_enum)]
     pub prover_mode: Option<ProverMode>,
@@ -55,7 +56,7 @@ impl ChainCreateArgs {
         let mut chain_name = self
             .chain_name
             .unwrap_or_else(|| Prompt::new(MSG_CHAIN_NAME_PROMPT).ask());
-        chain_name = slugify(&chain_name);
+        chain_name = slugify!(&chain_name, separator = "_");
 
         let chain_id = self.chain_id.unwrap_or_else(|| {
             Prompt::new(MSG_CHAIN_ID_PROMPT)

diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/genesis.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/genesis.rs
@@ -1,7 +1,8 @@
 use clap::Parser;
-use common::{db::DatabaseConfig, slugify, Prompt};
+use common::{db::DatabaseConfig, Prompt};
 use config::ChainConfig;
 use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
 use url::Url;
 
 use crate::{
@@ -48,21 +49,27 @@ impl GenesisArgs {
                     .default(DATABASE_SERVER_URL.as_str())
                     .ask()
             });
-            let server_db_name = slugify(&self.server_db_name.unwrap_or_else(|| {
-                Prompt::new(&msg_server_db_name_prompt(&chain_name))
-                    .default(&server_name)
-                    .ask()
-            }));
+            let server_db_name = slugify!(
+                &self.server_db_name.unwrap_or_else(|| {
+                    Prompt::new(&msg_server_db_name_prompt(&chain_name))
+                        .default(&server_name)
+                        .ask()
+                }),
+                separator = "_"
+            );
             let prover_db_url = self.prover_db_url.unwrap_or_else(|| {
                 Prompt::new(&msg_prover_db_url_prompt(&chain_name))
                     .default(DATABASE_PROVER_URL.as_str())
                     .ask()
             });
-            let prover_db_name = slugify(&self.prover_db_name.unwrap_or_else(|| {
-                Prompt::new(&msg_prover_db_name_prompt(&chain_name))
-                    .default(&prover_name)
-                    .ask()
-            }));
+            let prover_db_name = slugify!(
+                &self.prover_db_name.unwrap_or_else(|| {
+                    Prompt::new(&msg_prover_db_name_prompt(&chain_name))
+                        .default(&prover_name)
+                        .ask()
+                }),
+                separator = "_"
+            );
             GenesisArgsFinal {
                 server_db: DatabaseConfig::new(server_db_url, server_db_name),
                 prover_db: DatabaseConfig::new(prover_db_url, prover_db_name),

diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/create.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/create.rs
@@ -1,8 +1,9 @@
 use std::path::PathBuf;
 
 use clap::Parser;
-use common::{slugify, Prompt, PromptConfirm, PromptSelect};
+use common::{Prompt, PromptConfirm, PromptSelect};
 use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 use types::{L1Network, WalletCreation};
@@ -37,7 +38,7 @@ impl EcosystemCreateArgs {
         let mut ecosystem_name = self
             .ecosystem_name
             .unwrap_or_else(|| Prompt::new(MSG_ECOSYSTEM_NAME_PROMPT).ask());
-        ecosystem_name = slugify(&ecosystem_name);
+        ecosystem_name = slugify!(&ecosystem_name, separator = "_");
 
         let link_to_code = self.link_to_code.unwrap_or_else(|| {
             let link_to_code_selection =