aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-09-16 17:53:50 +0800
committerFelix Lange <fjl@twurst.com>2016-09-16 21:24:31 +0800
commitb42a5b118f1aa7ac1235547c8594146978941401 (patch)
tree5a0a56308fe3137f1c9c69394281dadfc4551f37 /common
parenteeb322ae649c4a1a32430cdddfffed70f509181e (diff)
downloaddexon-b42a5b118f1aa7ac1235547c8594146978941401.tar
dexon-b42a5b118f1aa7ac1235547c8594146978941401.tar.gz
dexon-b42a5b118f1aa7ac1235547c8594146978941401.tar.bz2
dexon-b42a5b118f1aa7ac1235547c8594146978941401.tar.lz
dexon-b42a5b118f1aa7ac1235547c8594146978941401.tar.xz
dexon-b42a5b118f1aa7ac1235547c8594146978941401.tar.zst
dexon-b42a5b118f1aa7ac1235547c8594146978941401.zip
common, node: move datadir defaults into package node
Diffstat (limited to 'common')
-rw-r--r--common/defaults.go48
-rw-r--r--common/path.go27
2 files changed, 0 insertions, 75 deletions
diff --git a/common/defaults.go b/common/defaults.go
deleted file mode 100644
index 8a136fa80..000000000
--- a/common/defaults.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2016 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package common
-
-import (
- "path/filepath"
- "runtime"
-)
-
-const (
- DefaultIPCSocket = "geth.ipc" // Default (relative) name of the IPC RPC socket
- DefaultHTTPHost = "localhost" // Default host interface for the HTTP RPC server
- DefaultHTTPPort = 8545 // Default TCP port for the HTTP RPC server
- DefaultWSHost = "localhost" // Default host interface for the websocket RPC server
- DefaultWSPort = 8546 // Default TCP port for the websocket RPC server
-)
-
-// DefaultDataDir is the default data directory to use for the databases and other
-// persistence requirements.
-func DefaultDataDir() string {
- // Try to place the data folder in the user's home dir
- home := HomeDir()
- if home != "" {
- if runtime.GOOS == "darwin" {
- return filepath.Join(home, "Library", "Ethereum")
- } else if runtime.GOOS == "windows" {
- return filepath.Join(home, "AppData", "Roaming", "Ethereum")
- } else {
- return filepath.Join(home, ".ethereum")
- }
- }
- // As we cannot guess a stable location, return empty and handle later
- return ""
-}
diff --git a/common/path.go b/common/path.go
index cbcd13c4f..bd8da86e7 100644
--- a/common/path.go
+++ b/common/path.go
@@ -19,10 +19,8 @@ package common
import (
"fmt"
"os"
- "os/user"
"path/filepath"
"runtime"
- "strings"
)
// MakeName creates a node name that follows the ethereum convention
@@ -32,21 +30,6 @@ 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
- sep := string(os.PathSeparator)
-
- // Check in case of paths like "/something/~/something/"
- if len(p) > 1 && p[:1+len(sep)] == "~"+sep {
- usr, _ := user.Current()
- dir := usr.HomeDir
-
- path = strings.Replace(p, "~", dir, 1)
- }
-
- return
-}
-
func FileExist(filePath string) bool {
_, err := os.Stat(filePath)
if err != nil && os.IsNotExist(err) {
@@ -62,13 +45,3 @@ func AbsolutePath(Datadir string, filename string) string {
}
return filepath.Join(Datadir, filename)
}
-
-func HomeDir() string {
- if home := os.Getenv("HOME"); home != "" {
- return home
- }
- if usr, err := user.Current(); err == nil {
- return usr.HomeDir
- }
- return ""
-}