Skip to content

Commit

Permalink
Merge aa0e774 into a50d5b0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffallen committed Feb 8, 2019
2 parents a50d5b0 + aa0e774 commit 05c96a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
9 changes: 2 additions & 7 deletions onet.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,9 @@ ProtocolInstance.
*/
package onet

// Version of onet.
const Version = "2.0"

// Version history notes:
// 1.2 (no comment)
// 2.0 first version where no base64 is allowed in {public,private}.toml files. Cothority's
// run_conode.sh migrates from 1.2->2.0 format files.

// This can be set during building. If set, it will be added onto the end
// of Version in the Status message.
var gitTag = ""
// 3+ version is recorded in the build via the Go modules system and exposed
// via rsc.io/goversion/version (see server.go)
7 changes: 0 additions & 7 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@ var goverOk = false

// GetStatus is a function that returns the status report of the server.
func (c *Server) GetStatus() *Status {
v := Version
if gitTag != "" {
v += "-"
v += gitTag
}

a := c.serviceManager.availableServices()
sort.Strings(a)

Expand All @@ -127,7 +121,6 @@ func (c *Server) GetStatus() *Status {
"Uptime": time.Now().Sub(c.started).String(),
"System": fmt.Sprintf("%s/%s/%s", runtime.GOOS, runtime.GOARCH,
runtime.Version()),
"Version": v,
"Host": c.ServerIdentity.Address.Host(),
"Port": c.ServerIdentity.Address.Port(),
"Description": c.ServerIdentity.Description,
Expand Down

0 comments on commit 05c96a4

Please sign in to comment.