diff options
| author | Felix Lange <fjl@twurst.com> | 2016-09-05 20:09:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-05 20:09:45 +0800 |
| commit | eac390f28955d66f9152102058e0d85d972bc033 (patch) | |
| tree | 39e8bbec7532fc8427a24563242a2d597a0a076b /cmd/geth/consolecmd_test.go | |
| parent | 2c6be49d200a3fff660ad78aada3305f8a3e3b9a (diff) | |
| parent | de54273f51af47fa7c7a66e5edc4c9c6fb03b178 (diff) | |
| download | dexon-eac390f28955d66f9152102058e0d85d972bc033.tar dexon-eac390f28955d66f9152102058e0d85d972bc033.tar.gz dexon-eac390f28955d66f9152102058e0d85d972bc033.tar.bz2 dexon-eac390f28955d66f9152102058e0d85d972bc033.tar.lz dexon-eac390f28955d66f9152102058e0d85d972bc033.tar.xz dexon-eac390f28955d66f9152102058e0d85d972bc033.tar.zst dexon-eac390f28955d66f9152102058e0d85d972bc033.zip | |
Merge pull request #2976 from fjl/utils-version
cmd/evm, cmd/geth, cmd/utils: move version handling to cmd/utils
Diffstat (limited to 'cmd/geth/consolecmd_test.go')
| -rw-r--r-- | cmd/geth/consolecmd_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index e0e549e12..3f09c0414 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -28,6 +28,7 @@ import ( "testing" "time" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/rpc" ) @@ -45,7 +46,7 @@ func TestConsoleWelcome(t *testing.T) { // Gather all the infos the welcome message needs to contain geth.setTemplateFunc("goos", func() string { return runtime.GOOS }) geth.setTemplateFunc("gover", runtime.Version) - geth.setTemplateFunc("gethver", func() string { return verString }) + geth.setTemplateFunc("gethver", func() string { return utils.Version }) geth.setTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) }) geth.setTemplateFunc("apis", func() []string { apis := append(strings.Split(rpc.DefaultIPCApis, ","), rpc.MetadataApi) @@ -131,7 +132,7 @@ func testAttachWelcome(t *testing.T, geth *testgeth, endpoint string) { // Gather all the infos the welcome message needs to contain attach.setTemplateFunc("goos", func() string { return runtime.GOOS }) attach.setTemplateFunc("gover", runtime.Version) - attach.setTemplateFunc("gethver", func() string { return verString }) + attach.setTemplateFunc("gethver", func() string { return utils.Version }) attach.setTemplateFunc("etherbase", func() string { return geth.Etherbase }) attach.setTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) }) attach.setTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") }) |