diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 4cf631354f..13afc67125 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -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 "" "" # Set default IPC endpoint (https://github.com/ethereum/EIPs/issues/147) - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\geth.ipc" - ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\geth.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "R" "HKLM" "\\.\pipe\gubiq.ipc" + ${EnvVarUpdate} $0 "ETHEREUM_SOCKET" "A" "HKLM" "\\.\pipe\gubiq.ipc" # Add geth to PATH ${EnvVarUpdate} $0 "PATH" "A" "HKLM" $INSTDIR diff --git a/build/nsis.uninstall.nsh b/build/nsis.uninstall.nsh index ea7d5e2981..8f22a8d9b2 100644 --- a/build/nsis.uninstall.nsh +++ b/build/nsis.uninstall.nsh @@ -22,7 +22,7 @@ Section "Uninstall" SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)" # 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 ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" $INSTDIR diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 0d72d54f37..15e9a2b5b1 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -79,7 +79,7 @@ func TestIPCAttachWelcome(t *testing.T) { } else { ws := tmpdir(t) 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 // list of ipc modules and shh is included there. diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b1fdf3acf4..0a65c71939 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -290,7 +290,7 @@ var ( IPCPathFlag = DirectoryFlag{ Name: "ipcpath", Usage: "Filename for IPC socket/pipe within the datadir (explicit paths escape it)", - Value: DirectoryString{"geth.ipc"}, + Value: DirectoryString{"gubiq.ipc"}, } WSEnabledFlag = cli.BoolFlag{ Name: "ws", diff --git a/node/config_test.go b/node/config_test.go index 96d6fc2c7c..ea7c6030b1 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -72,15 +72,15 @@ func TestIPCPathResolution(t *testing.T) { }{ {"", "", false, ""}, {"data", "", false, ""}, - {"", "geth.ipc", false, filepath.Join(os.TempDir(), "geth.ipc")}, - {"data", "geth.ipc", false, "data/geth.ipc"}, - {"data", "./geth.ipc", false, "./geth.ipc"}, - {"data", "/geth.ipc", false, "/geth.ipc"}, + {"", "gubiq.ipc", false, filepath.Join(os.TempDir(), "gubiq.ipc")}, + {"data", "gubiq.ipc", false, "data/gubiq.ipc"}, + {"data", "./gubiq.ipc", false, "./gubiq.ipc"}, + {"data", "/gubiq.ipc", false, "/gubiq.ipc"}, {"", "", true, ``}, {"data", "", true, ``}, - {"", "geth.ipc", true, `\\.\pipe\geth.ipc`}, - {"data", "geth.ipc", true, `\\.\pipe\geth.ipc`}, - {"data", `\\.\pipe\geth.ipc`, true, `\\.\pipe\geth.ipc`}, + {"", "gubiq.ipc", true, `\\.\pipe\gubiq.ipc`}, + {"data", "gubiq.ipc", true, `\\.\pipe\gubiq.ipc`}, + {"data", `\\.\pipe\gubiq.ipc`, true, `\\.\pipe\gubiq.ipc`}, } for i, test := range tests { // Only run when platform/test match diff --git a/node/defaults.go b/node/defaults.go index a580189df1..6db9988e54 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -24,7 +24,7 @@ import ( ) 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 DefaultHTTPPort = 8588 // Default TCP port for the HTTP RPC server DefaultWSHost = "localhost" // Default host interface for the websocket RPC server