forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 14:46:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify DefaultIPCSocket

Browse source
This commit is contained in:
Julian Yap 2016-11-18 23:47:33 -10:00
parent 3d2051fa4e
commit e7d58c4cd8
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/nsis.install.nsh
View file

@ -34,8 +34,8 @@ Section "Geth" GETH_IDX
SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" "" SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$INSTDIR\geth.exe" "" "" "Ethereum" "" 30303 "" ""
# Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147) # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\gubiq.ipc"
${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc" ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\gubiq.ipc"
# Add geth to PATH # Add geth to PATH
${EnvVarUpdate} $0 "PATH" "A" "HKLM" $INSTDIR ${EnvVarUpdate} $0 "PATH" "A" "HKLM" $INSTDIR

2
build/nsis.uninstall.nsh
View file

@ -22,7 +22,7 @@ Section "Uninstall"
SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)" SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"
# Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147) # Remove IPC endpoint (https://github.com/ethereum/EIPs/issues/147)
${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" ${un.EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\gubiq.ipc"
# Remove install directory from PATH # Remove install directory from PATH
${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" $INSTDIR ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" $INSTDIR

2
cmd/geth/consolecmd_test.go
View file

@ -79,7 +79,7 @@ func TestIPCAttachWelcome(t *testing.T) {
} else { } else {
ws := tmpdir(t) ws := tmpdir(t)
defer os.RemoveAll(ws) defer os.RemoveAll(ws)
ipc = filepath.Join(ws, "geth.ipc") ipc = filepath.Join(ws, "gubiq.ipc")
} }
// Note: we need --shh because testAttachWelcome checks for default // Note: we need --shh because testAttachWelcome checks for default
// list of ipc modules and shh is included there. // list of ipc modules and shh is included there.

2
cmd/utils/flags.go
View file

@ -290,7 +290,7 @@ var (
IPCPathFlag = DirectoryFlag{ IPCPathFlag = DirectoryFlag{
Name: "ipcpath", Name: "ipcpath",
Usage: "Filename for IPC socket/pipe within the datadir (explicit paths escape it)", Usage: "Filename for IPC socket/pipe within the datadir (explicit paths escape it)",
Value: DirectoryString{"geth.ipc"}, Value: DirectoryString{"gubiq.ipc"},
} }
WSEnabledFlag = cli.BoolFlag{ WSEnabledFlag = cli.BoolFlag{
Name: "ws", Name: "ws",

14
node/config_test.go
View file

@ -72,15 +72,15 @@ func TestIPCPathResolution(t *testing.T) {
}{ }{
{"", "", false, ""}, {"", "", false, ""},
{"data", "", false, ""}, {"data", "", false, ""},
{"", "geth.ipc", false, filepath.Join(os.TempDir(), "geth.ipc")}, {"", "gubiq.ipc", false, filepath.Join(os.TempDir(), "gubiq.ipc")},
{"data", "geth.ipc", false, "data/geth.ipc"}, {"data", "gubiq.ipc", false, "data/gubiq.ipc"},
{"data", "./geth.ipc", false, "./geth.ipc"}, {"data", "./gubiq.ipc", false, "./gubiq.ipc"},
{"data", "/geth.ipc", false, "/geth.ipc"}, {"data", "/gubiq.ipc", false, "/gubiq.ipc"},
{"", "", true, ``}, {"", "", true, ``},
{"data", "", true, ``}, {"data", "", true, ``},
{"", "geth.ipc", true, `\\.\pipe\geth.ipc`}, {"", "gubiq.ipc", true, `\\.\pipe\gubiq.ipc`},
{"data", "geth.ipc", true, `\\.\pipe\geth.ipc`}, {"data", "gubiq.ipc", true, `\\.\pipe\gubiq.ipc`},
{"data", `\\.\pipe\geth.ipc`, true, `\\.\pipe\geth.ipc`}, {"data", `\\.\pipe\gubiq.ipc`, true, `\\.\pipe\gubiq.ipc`},
} }
for i, test := range tests { for i, test := range tests {
// Only run when platform/test match // Only run when platform/test match

2
node/defaults.go
View file

@ -24,7 +24,7 @@ import (
) )
const ( const (
DefaultIPCSocket = "geth.ipc" // Default (relative) name of the IPC RPC socket DefaultIPCSocket = "gubiq.ipc" // Default (relative) name of the IPC RPC socket
DefaultHTTPHost = "localhost" // Default host interface for the HTTP RPC server DefaultHTTPHost = "localhost" // Default host interface for the HTTP RPC server
DefaultHTTPPort = 8588 // Default TCP port for the HTTP RPC server DefaultHTTPPort = 8588 // Default TCP port for the HTTP RPC server
DefaultWSHost = "localhost" // Default host interface for the websocket RPC server DefaultWSHost = "localhost" // Default host interface for the websocket RPC server