From de1f72b2941cc3e70d252bbf983e54bbb03d542e Mon Sep 17 00:00:00 2001 From: Joel Burget Date: Tue, 7 Nov 2017 11:25:02 -0500 Subject: [PATCH] Remove Quorum version insertion. It resulted in "Geth/vquorum" in the console. Instead print the Quorum version just in the version command. --- cmd/geth/misccmd.go | 1 + params/version.go | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index 7e15a9ad7..63c02438f 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -112,6 +112,7 @@ func version(ctx *cli.Context) error { if gitCommit != "" { fmt.Println("Git Commit:", gitCommit) } + fmt.Println("Quorum Version:", params.QuorumVersion) fmt.Println("Architecture:", runtime.GOARCH) fmt.Println("Network Id:", eth.DefaultConfig.NetworkId) fmt.Println("Go Version:", runtime.Version()) diff --git a/params/version.go b/params/version.go index 907b9ddc1..8d0e526cf 100644 --- a/params/version.go +++ b/params/version.go @@ -38,11 +38,14 @@ var Version = func() string { v += "-" + VersionMeta } - v = fmt.Sprintf("quorum %d.%d.%d (geth %s)", QuorumVersionMajor, QuorumVersionMinor, QuorumVersionPatch, v) - return v }() +// Version holds the textual version string. +var QuorumVersion = func() string { + return fmt.Sprintf("%d.%d.%d", QuorumVersionMajor, QuorumVersionMinor, QuorumVersionPatch) +}() + func VersionWithCommit(gitCommit string) string { vsn := Version if len(gitCommit) >= 8 {