From 026f31235d8f5082a792a81a0e5f2997c51b713a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 12 Apr 2017 01:26:10 +0200
Subject: [PATCH] node: remove default IPC path

Set it in the frontends instead.
---
 cmd/geth/config.go |  1 +
 cmd/swarm/main.go  |  1 -
 cmd/utils/flags.go |  1 -
 node/defaults.go   | 10 ++++------
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index 5d7b1a1f7b..86dd4bfdf9 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -100,6 +100,7 @@ func defaultNodeConfig() node.Config {
 	cfg.Version = params.VersionWithCommit(gitCommit)
 	cfg.HTTPModules = append(cfg.HTTPModules, "eth")
 	cfg.WSModules = append(cfg.WSModules, "eth")
+	cfg.IPCPath = "geth.ipc"
 	return cfg
 }
 
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 2491cedb6e..833083b91f 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -133,7 +133,6 @@ func init() {
 	defaultNodeConfig.IPCPath = "bzzd.ipc"
 	// Set flag defaults for --help display.
 	utils.ListenPortFlag.Value = 30399
-	utils.IPCPathFlag.Value = utils.DirectoryString{"bzzd.ipc"}
 }
 
 var app = utils.NewApp(gitCommit, "Ethereum Swarm")
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 7fdb381ce6..694eb21ea1 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -293,7 +293,6 @@ var (
 	IPCPathFlag = DirectoryFlag{
 		Name:  "ipcpath",
 		Usage: "Filename for IPC socket/pipe within the datadir (explicit paths escape it)",
-		Value: DirectoryString{"geth.ipc"},
 	}
 	WSEnabledFlag = cli.BoolFlag{
 		Name:  "ws",
diff --git a/node/defaults.go b/node/defaults.go
index 519c2d3741..d4e1486834 100644
--- a/node/defaults.go
+++ b/node/defaults.go
@@ -27,11 +27,10 @@ import (
 )
 
 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
+	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
 )
 
 // DefaultConfig contains reasonable default settings.
@@ -41,7 +40,6 @@ var DefaultConfig = Config{
 	HTTPModules: []string{"net", "web3"},
 	WSPort:      DefaultWSPort,
 	WSModules:   []string{"net", "web3"},
-	IPCPath:     DefaultIPCSocket,
 	P2P: p2p.Config{
 		ListenAddr: ":30303",
 		MaxPeers:   25,