From 34591d2f2f774734e11a4a7c04a7b33f6d2721a3 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 3 Oct 2020 16:45:27 +0000
Subject: [PATCH] Show commit in `--version` and ledger-tool's log (#12636)
 (#12662)

* Show commit in `--version` and ledger-tool's log

* Another handy hidden env var

* Fix test

* Rename to semver!

* Fix syntax error...

(cherry picked from commit 026e7de8198a19c6a0c70f5bf4cb19b8ee69fbe6)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
---
 core/tests/client.rs    | 2 +-
 ledger-tool/src/main.rs | 2 ++
 run.sh                  | 4 +++-
 version/src/lib.rs      | 9 ++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/tests/client.rs b/core/tests/client.rs
index ba849ded44..b74b96e0f2 100644
--- a/core/tests/client.rs
+++ b/core/tests/client.rs
@@ -44,7 +44,7 @@ fn test_rpc_client() {
 
     assert_eq!(
         client.get_version().unwrap().solana_core,
-        solana_version::version!()
+        solana_version::semver!()
     );
 
     assert!(client.get_account(&bob_pubkey).is_err());
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 14c7b35f0c..8eb8a5ab06 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -1246,6 +1246,8 @@ fn main() {
         )
         .get_matches();
 
+    info!("{} {}", crate_name!(), solana_version::version!());
+
     let ledger_path = PathBuf::from(value_t!(matches, "ledger_path", String).unwrap_or_else(
         |_err| {
             eprintln!(
diff --git a/run.sh b/run.sh
index 74deb4b355..f7547f6370 100755
--- a/run.sh
+++ b/run.sh
@@ -34,6 +34,8 @@ export RUST_BACKTRACE=1
 dataDir=$PWD/config/"$(basename "$0" .sh)"
 ledgerDir=$PWD/config/ledger
 
+SOLANA_RUN_SH_CLUSTER_TYPE=${SOLANA_RUN_SH_CLUSTER_TYPE:-development}
+
 set -x
 validator_identity="$dataDir/validator-identity.json"
 if [[ -e $validator_identity ]]; then
@@ -78,7 +80,7 @@ else
       "$dataDir"/validator-vote-account.json \
       "$dataDir"/validator-stake-account.json \
     --ledger "$ledgerDir" \
-    --cluster-type development \
+    --cluster-type "$SOLANA_RUN_SH_CLUSTER_TYPE" \
     $SPL_GENESIS_ARGS \
     $SOLANA_RUN_SH_GENESIS_ARGS
 fi
diff --git a/version/src/lib.rs b/version/src/lib.rs
index 6b21555de5..37474804ba 100644
--- a/version/src/lib.rs
+++ b/version/src/lib.rs
@@ -91,12 +91,19 @@ impl fmt::Debug for Version {
 impl Sanitize for Version {}
 
 #[macro_export]
-macro_rules! version {
+macro_rules! semver {
     () => {
         &*format!("{}", $crate::Version::default())
     };
 }
 
+#[macro_export]
+macro_rules! version {
+    () => {
+        &*format!("{:?}", $crate::Version::default())
+    };
+}
+
 #[cfg(test)]
 mod test {
     use super::*;