aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-22 20:46:21 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-22 20:46:21 +0800
commit2477d10aa0ac80b0735f3069a214c804cd6be957 (patch)
tree48a2f82df00ba11542e42a88758876920132bb4a
parentc0741edc34c3d09b69c7a64a97aaca0e7759add1 (diff)
downloaddexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar.gz
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar.bz2
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar.lz
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar.xz
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.tar.zst
dexon-2477d10aa0ac80b0735f3069a214c804cd6be957.zip
Move MakeName to path
-rw-r--r--common/common.go8
-rw-r--r--common/path.go8
2 files changed, 8 insertions, 8 deletions
diff --git a/common/common.go b/common/common.go
index b5eacfdb7..6c5a69d18 100644
--- a/common/common.go
+++ b/common/common.go
@@ -3,17 +3,9 @@ package common
import (
"fmt"
"math/big"
- "runtime"
"time"
)
-// MakeName creates a node name that follows the ethereum convention
-// for such names. It adds the operation system name and Go runtime version
-// the name.
-func MakeName(name, version string) string {
- return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version())
-}
-
// Common big integers often used
var (
Big1 = big.NewInt(1)
diff --git a/common/path.go b/common/path.go
index 8b95a2be6..d38b1fd5b 100644
--- a/common/path.go
+++ b/common/path.go
@@ -1,6 +1,7 @@
package common
import (
+ "fmt"
"io/ioutil"
"os"
"os/user"
@@ -12,6 +13,13 @@ import (
"github.com/kardianos/osext"
)
+// MakeName creates a node name that follows the ethereum convention
+// for such names. It adds the operation system name and Go runtime version
+// the name.
+func MakeName(name, version string) string {
+ return fmt.Sprintf("%s/v%s/%s/%s", name, version, runtime.GOOS, runtime.Version())
+}
+
func ExpandHomePath(p string) (path string) {
path = p