Refactor Name

stellar · Jul 18, 2024 · 996dea4 · 996dea4
1 parent ec3d39f
commit 996dea4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/cmd/soroban-cli/src/commands/network/container/logs.rs b/cmd/soroban-cli/src/commands/network/container/logs.rs
@@ -24,7 +24,7 @@ pub struct Cmd {
 
 impl Cmd {
     pub async fn run(&self) -> Result<(), Error> {
-        let container_name = Name::new(self.name.clone()).get_internal_container_name();
+        let container_name = Name(self.name.clone()).get_internal_container_name();
         let docker = self.container_args.connect_to_docker().await?;
         let logs_stream = &mut docker.logs(
             &container_name,

diff --git a/cmd/soroban-cli/src/commands/network/container/shared.rs b/cmd/soroban-cli/src/commands/network/container/shared.rs
@@ -126,12 +126,8 @@ impl fmt::Display for Network {
     }
 }
 
-pub struct Name(String);
+pub struct Name(pub String);
 impl Name {
-    pub fn new(name: String) -> Self {
-        Self(name)
-    }
-
     pub fn get_internal_container_name(&self) -> String {
         format!("stellar-{}", self.0)
     }
@@ -178,4 +174,4 @@ async fn check_docker_connection(docker: &Docker) -> Result<(), bollard::errors:
             Err(err)
         }
     }
-}
+}
diff --git a/cmd/soroban-cli/src/commands/network/container/start.rs b/cmd/soroban-cli/src/commands/network/container/start.rs
@@ -164,7 +164,7 @@ impl Cmd {
     }
 
     fn container_name(&self) -> Name {
-        Name::new(self.name.clone().unwrap_or(self.network.to_string()))
+        Name(self.name.clone().unwrap_or(self.network.to_string()))
     }
 
     fn print_log_message(&self) {

diff --git a/cmd/soroban-cli/src/commands/network/container/stop.rs b/cmd/soroban-cli/src/commands/network/container/stop.rs
@@ -29,7 +29,7 @@ pub struct Cmd {
 
 impl Cmd {
     pub async fn run(&self) -> Result<(), Error> {
-        let container_name = Name::new(self.name.clone());
+        let container_name = Name(self.name.clone());
         let docker = self.container_args.connect_to_docker().await?;
         println!(
             "ℹ️ Stopping container: {}",