Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(zk_tool): Change some texts #2027

Merged
merged 3 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct InitArgs {
impl InitArgs {
pub fn fill_values_with_prompt(self, config: &ChainConfig) -> InitArgsFinal {
let deploy_paymaster = self.deploy_paymaster.unwrap_or_else(|| {
common::PromptConfirm::new("Do you want to deploy paymaster contract?")
common::PromptConfirm::new("Do you want to deploy a test paymaster?")
.default(true)
.ask()
});
Expand Down
12 changes: 11 additions & 1 deletion zk_toolbox/crates/zk_inception/src/commands/containers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,17 @@ pub fn initialize_docker(shell: &Shell, ecosystem: &EcosystemConfig) -> anyhow::
}

pub fn start_containers(shell: &Shell) -> anyhow::Result<()> {
docker::up(shell, DOCKER_COMPOSE_FILE).context("Failed to start containers")
while let Err(err) = docker::up(shell, DOCKER_COMPOSE_FILE) {
logger::error(err.to_string());
if !common::PromptConfirm::new(
"Failed to start containers. Make sure there is nothing running on default ports for Ethereum node l1 and postgres. Want to try again?",
).default(true)
.ask()
{
return Err(err);
}
}
Ok(())
}

fn create_docker_folders(shell: &Shell) -> anyhow::Result<()> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,11 @@ impl EcosystemCreateArgs {
let chain = self.chain.fill_values_with_prompt(0);

let start_containers = self.start_containers.unwrap_or_else(|| {
PromptConfirm::new("Do you want to start containers after creating the ecosystem?")
.default(true)
.ask()
PromptConfirm::new(
"Do you want to start database and L1 containers after creating the ecosystem?",
)
.default(true)
.ask()
});

EcosystemCreateArgsFinal {
Expand Down Expand Up @@ -110,7 +112,7 @@ impl EcosystemCreateArgsFinal {

#[derive(Debug, Clone, EnumIter, Display, PartialEq, Eq)]
enum LinkToCodeSelection {
#[strum(serialize = "Clone for me")]
#[strum(serialize = "Clone for me (recommended)")]
Clone,
#[strum(serialize = "I have the code already")]
Path,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct EcosystemArgs {
impl EcosystemArgs {
pub fn fill_values_with_prompt(self) -> EcosystemArgsFinal {
let deploy_ecosystem = self.deploy_ecosystem.unwrap_or_else(|| {
PromptConfirm::new("Do you want to deploy ecosystem contracts?")
PromptConfirm::new("Do you want to deploy ecosystem contracts? (Not needed if you already have an existing one)")
.default(true)
.ask()
});
Expand Down Expand Up @@ -64,7 +64,7 @@ impl EcosystemInitArgs {
.ask()
});
let deploy_erc20 = self.deploy_erc20.unwrap_or_else(|| {
PromptConfirm::new("Do you want to deploy test ERC20?")
PromptConfirm::new("Do you want to deploy some test ERC20s?")
.default(true)
.ask()
});
Expand Down
Loading