Remove redundant functions

Signed-off-by: Danil <[email protected]>

Author: Deniallugo

zkstack_cli/crates/zkstack/src/commands/ctm/args/mod.rs

@@ -7,7 +7,7 @@ use zksync_basic_types::H160;
 use zksync_web3_decl::jsonrpsee::core::Serialize;
 
 use crate::{
-    commands::ecosystem::args::init::{EcosystemArgs, EcosystemArgsFinal, EcosystemInitArgsFinal},
+    commands::ecosystem::args::init::{EcosystemArgs, EcosystemArgsFinal},
     messages::{MSG_BRIDGEHUB, MSG_DEV_ARG_HELP, MSG_ZKSYNC_OS},
 };
 
@@ -54,16 +54,6 @@ pub struct RegisterCTMArgsFinal {
     pub update_submodules: Option<bool>,
 }
 
-impl From<EcosystemInitArgsFinal> for RegisterCTMArgsFinal {
-    fn from(args: EcosystemInitArgsFinal) -> Self {
-        RegisterCTMArgsFinal {
-            ecosystem: args.ecosystem,
-            forge_args: args.forge_args,
-            update_submodules: None,
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Parser)]
 pub struct InitNewCTMArgs {
     #[clap(flatten)]
@@ -136,17 +126,3 @@ pub struct InitNewCTMArgsFinal {
     pub bridgehub_address: Option<H160>,
     pub zksync_os: bool,
 }
-
-impl From<EcosystemInitArgsFinal> for InitNewCTMArgsFinal {
-    fn from(args: EcosystemInitArgsFinal) -> Self {
-        InitNewCTMArgsFinal {
-            ecosystem: args.ecosystem,
-            forge_args: args.forge_args,
-            update_submodules: None,
-            skip_contract_compilation_override: args.skip_contract_compilation_override,
-            support_l2_legacy_shared_bridge_test: args.support_l2_legacy_shared_bridge_test,
-            bridgehub_address: args.bridgehub_address,
-            zksync_os: args.zksync_os,
-        }
-    }
-}

zkstack_cli/crates/zkstack/src/commands/ctm/commands/init_new_ctm.rs

@@ -27,7 +27,7 @@ use zkstack_cli_types::{L1Network, ProverMode};
 use crate::{
     admin_functions::{accept_admin, accept_owner},
     commands::{
-        ctm::args::{InitNewCTMArgs, InitNewCTMArgsFinal},
+        ctm::args::InitNewCTMArgs,
         ecosystem::{
             args::init::EcosystemArgsFinal, create_configs::create_initial_deployments_config,
         },
@@ -56,32 +56,15 @@ pub async fn run(args: InitNewCTMArgs, shell: &Shell) -> anyhow::Result<()> {
         Err(_) => create_initial_deployments_config(shell, &ecosystem_config.config)?,
     };
 
-    let mut init_ctm_args = args
+    let init_ctm_args = args
         .clone()
         .fill_values_with_prompt(ecosystem_config.l1_network)
         .await?;
 
     logger::info(MSG_INITIALIZING_CTM);
 
-    init_ctm(
-        &mut init_ctm_args,
-        shell,
-        &ecosystem_config,
-        &initial_deployment_config,
-    )
-    .await?;
-
-    Ok(())
-}
-
-async fn init_ctm(
-    init_args: &mut InitNewCTMArgsFinal,
-    shell: &Shell,
-    ecosystem_config: &EcosystemConfig,
-    initial_deployment_config: &InitialDeploymentConfig,
-) -> anyhow::Result<ContractsConfig> {
     let spinner = Spinner::new(MSG_INTALLING_DEPS_SPINNER);
-    if !init_args.skip_contract_compilation_override {
+    if !init_ctm_args.skip_contract_compilation_override {
         install_yarn_dependencies(shell, &ecosystem_config.link_to_code())?;
         build_da_contracts(shell, &ecosystem_config.contracts_path())?;
         build_l1_contracts(shell.clone(), &ecosystem_config.contracts_path())?;
@@ -90,25 +73,25 @@ async fn init_ctm(
     }
     spinner.finish();
 
-    let contracts = deploy_new_ctm(
+    let contracts = deploy_new_ctm_and_accept_admin(
         shell,
-        &mut init_args.ecosystem,
-        init_args.forge_args.clone(),
-        ecosystem_config,
-        initial_deployment_config,
-        init_args.support_l2_legacy_shared_bridge_test,
-        init_args.bridgehub_address, // Scripts are expected to consume 0 address for BH
-        init_args.zksync_os,
+        &init_ctm_args.ecosystem,
+        init_ctm_args.forge_args.clone(),
+        &ecosystem_config,
+        &initial_deployment_config,
+        init_ctm_args.support_l2_legacy_shared_bridge_test,
+        init_ctm_args.bridgehub_address, // Scripts are expected to consume 0 address for BH
+        init_ctm_args.zksync_os,
     )
     .await?;
     contracts.save_with_base_path(shell, &ecosystem_config.config)?;
-    Ok(contracts)
+    Ok(())
 }
 
 #[allow(clippy::too_many_arguments)]
-pub async fn deploy_new_ctm(
+pub async fn deploy_new_ctm_and_accept_admin(
     shell: &Shell,
-    ecosystem: &mut EcosystemArgsFinal,
+    ecosystem: &EcosystemArgsFinal,
     forge_args: ForgeScriptArgs,
     ecosystem_config: &EcosystemConfig,
     initial_deployment_config: &InitialDeploymentConfig,
@@ -118,7 +101,7 @@ pub async fn deploy_new_ctm(
 ) -> anyhow::Result<ContractsConfig> {
     let l1_rpc_url = ecosystem.l1_rpc_url.clone();
     let spinner = Spinner::new(MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER);
-    let contracts_config = deploy_l1(
+    let contracts_config = deploy_new_ctm(
         shell,
         &forge_args,
         ecosystem_config,
@@ -163,7 +146,7 @@ pub async fn deploy_new_ctm(
 }
 
 #[allow(clippy::too_many_arguments)]
-pub async fn deploy_l1(
+pub async fn deploy_new_ctm(
     shell: &Shell,
     forge_args: &ForgeScriptArgs,
     config: &EcosystemConfig,

zkstack_cli/crates/zkstack/src/commands/ctm/commands/register_ctm.rs

@@ -10,7 +10,7 @@ use zkstack_cli_config::{
 use zkstack_cli_types::L1Network;
 
 use crate::{
-    commands::ctm::args::{RegisterCTMArgs, RegisterCTMArgsFinal},
+    commands::ctm::args::RegisterCTMArgs,
     messages::MSG_REGISTERING_CTM,
     utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
 };
@@ -22,37 +22,18 @@ pub async fn run(args: RegisterCTMArgs, shell: &Shell) -> anyhow::Result<()> {
         git::submodule_update(shell, &ecosystem_config.link_to_code())?;
     }
 
-    let mut final_ecosystem_args = args
+    let final_ecosystem_args = args
         .clone()
         .fill_values_with_prompt(ecosystem_config.l1_network)
         .await?;
 
     logger::info(MSG_REGISTERING_CTM);
 
-    let forge_args = final_ecosystem_args.forge_args.clone();
-
     register_ctm(
-        &mut final_ecosystem_args,
         shell,
-        forge_args,
+        &final_ecosystem_args.forge_args,
         &ecosystem_config,
-    )
-    .await?;
-
-    Ok(())
-}
-
-pub async fn register_ctm(
-    init_args: &mut RegisterCTMArgsFinal,
-    shell: &Shell,
-    forge_args: ForgeScriptArgs,
-    ecosystem_config: &EcosystemConfig,
-) -> anyhow::Result<()> {
-    register_ctm_on_existing_bh(
-        shell,
-        &forge_args,
-        ecosystem_config,
-        &init_args.ecosystem.l1_rpc_url,
+        &final_ecosystem_args.ecosystem.l1_rpc_url,
         None,
         true,
     )
@@ -61,7 +42,7 @@ pub async fn register_ctm(
     Ok(())
 }
 
-pub async fn register_ctm_on_existing_bh(
+pub async fn register_ctm(
     shell: &Shell,
     forge_args: &ForgeScriptArgs,
     config: &EcosystemConfig,

zkstack_cli/crates/zkstack/src/commands/ctm/mod.rs

@@ -4,7 +4,6 @@ pub(crate) mod commands;
 use clap::Subcommand;
 use xshell::Shell;
 
-pub use crate::commands::ctm::args::RegisterCTMArgsFinal;
 use crate::commands::ctm::{
     args::{InitNewCTMArgs, RegisterCTMArgs},
     commands::{init_new_ctm, register_ctm},

zkstack_cli/crates/zkstack/src/commands/ecosystem/build_transactions.rs

@@ -12,7 +12,7 @@ use super::{
     create_configs::create_initial_deployments_config,
 };
 use crate::{
-    commands::ctm::commands::init_new_ctm::deploy_l1,
+    commands::ctm::commands::init_new_ctm::deploy_new_ctm,
     messages::{
         MSG_BUILDING_ECOSYSTEM, MSG_BUILDING_ECOSYSTEM_CONTRACTS_SPINNER, MSG_ECOSYSTEM_TXN_OUTRO,
         MSG_ECOSYSTEM_TXN_OUT_PATH_INVALID_ERR, MSG_INTALLING_DEPS_SPINNER,
@@ -46,7 +46,7 @@ pub async fn run(args: BuildTransactionsArgs, shell: &Shell) -> anyhow::Result<(
     spinner.finish();
 
     let spinner = Spinner::new(MSG_BUILDING_ECOSYSTEM_CONTRACTS_SPINNER);
-    let contracts_config = deploy_l1(
+    let contracts_config = deploy_new_ctm(
         shell,
         &args.forge_args,
         &ecosystem_config,

zkstack_cli/crates/zkstack/src/commands/ecosystem/init.rs

@@ -27,9 +27,8 @@ use super::{
 use crate::{
     admin_functions::{accept_admin, accept_owner},
     commands::{
-        ctm::{
-            commands::{init_new_ctm::deploy_new_ctm, register_ctm::register_ctm},
-            RegisterCTMArgsFinal,
+        ctm::commands::{
+            init_new_ctm::deploy_new_ctm_and_accept_admin, register_ctm::register_ctm,
         },
         ecosystem::{
             common::deploy_l1_core_contracts,
@@ -102,7 +101,7 @@ pub async fn run(args: EcosystemInitArgs, shell: &Shell) -> anyhow::Result<()> {
 }
 
 async fn init_ecosystem(
-    init_args: &mut EcosystemInitArgsFinal,
+    init_args: &EcosystemInitArgsFinal,
     shell: &Shell,
     ecosystem_config: &EcosystemConfig,
     initial_deployment_config: &InitialDeploymentConfig,
@@ -119,7 +118,7 @@ async fn init_ecosystem(
 
     let mut contracts = deploy_ecosystem(
         shell,
-        &mut init_args.ecosystem,
+        &init_args.ecosystem,
         init_args.forge_args.clone(),
         ecosystem_config,
         initial_deployment_config,
@@ -129,9 +128,9 @@ async fn init_ecosystem(
     .await?;
     contracts.save_with_base_path(shell, &ecosystem_config.config)?;
 
-    contracts = deploy_new_ctm(
+    contracts = deploy_new_ctm_and_accept_admin(
         shell,
-        &mut init_args.ecosystem,
+        &init_args.ecosystem,
         init_args.forge_args.clone(),
         ecosystem_config,
         initial_deployment_config,
@@ -144,15 +143,22 @@ async fn init_ecosystem(
 
     let forge_args = init_args.forge_args.clone();
 
-    let mut reg_args = RegisterCTMArgsFinal::from((*init_args).clone());
-    register_ctm(&mut reg_args, shell, forge_args, ecosystem_config).await?;
+    register_ctm(
+        shell,
+        &forge_args,
+        &ecosystem_config,
+        &init_args.ecosystem.l1_rpc_url,
+        None,
+        true,
+    )
+    .await?;
 
     Ok(contracts)
 }
 
 async fn deploy_ecosystem(
     shell: &Shell,
-    ecosystem: &mut EcosystemArgsFinal,
+    ecosystem: &EcosystemArgsFinal,
     forge_args: ForgeScriptArgs,
     ecosystem_config: &EcosystemConfig,
     initial_deployment_config: &InitialDeploymentConfig,