Merge branch 'main' into ledger-types-uint32

stellar · Nov 28, 2023 · 5c65088 · 5c65088
2 parents 495b112 + db3030a
commit 5c65088
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/cmd/soroban-cli/src/commands/mod.rs b/cmd/soroban-cli/src/commands/mod.rs
@@ -45,9 +45,8 @@ Full CLI reference: https://github.com/stellar/soroban-tools/tree/main/docs/soro
 #[derive(Parser, Debug)]
 #[command(
     name = "soroban",
-    version = version::short(),
-    long_version = version::long(),
     about = ABOUT,
+    version = version::long(),
     long_about = ABOUT.to_string() + LONG_ABOUT,
     disable_help_subcommand = true,
 )]

diff --git a/cmd/soroban-cli/src/commands/version.rs b/cmd/soroban-cli/src/commands/version.rs
@@ -15,15 +15,11 @@ impl Cmd {
     }
 }
 
-pub fn short() -> String {
-    format!("{} ({GIT_REVISION})", env!("CARGO_PKG_VERSION"))
-}
-
 pub fn long() -> String {
     let env = soroban_env_host::VERSION;
     let xdr = soroban_env_host::VERSION.xdr;
     [
-        short(),
+        format!("{} ({GIT_REVISION})", env!("CARGO_PKG_VERSION")),
         format!("soroban-env {} ({})", env.pkg, env.rev),
         format!("soroban-env interface version {}", meta::INTERFACE_VERSION),
         format!(