Merge pull request ethereum#19 from nisdas/IPCPath

Add IPC Path Flag to sharding client
enriquefynn · Feb 8, 2018 · 7afef58 · 7afef58
2 parents d0c5585 + 1440784
commit 7afef58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/geth/shardingcmd.go b/cmd/geth/shardingcmd.go
@@ -14,7 +14,7 @@ var (
 		Aliases:   []string{"shard"},
 		Usage:     "Start a sharding client",
 		ArgsUsage: "[endpoint]",
-		Flags:     []cli.Flag{utils.DataDirFlag, utils.PasswordFileFlag, utils.NetworkIdFlag},
+		Flags:     []cli.Flag{utils.DataDirFlag, utils.PasswordFileFlag, utils.NetworkIdFlag,utils.IPCPathFlag},
 		Category:  "SHARDING COMMANDS",
 		Description: `
 Launches a sharding client that connects to a running geth node and proposes collations to a Validator Manager Contract. This feature is a work in progress.

diff --git a/sharding/client.go b/sharding/client.go
@@ -45,6 +45,9 @@ func MakeShardingClient(ctx *cli.Context) *Client {
 	if endpoint == "" {
 		endpoint = fmt.Sprintf("%s/%s.ipc", path, clientIdentifier)
 	}
+	if ctx.GlobalIsSet(utils.IPCPathFlag.Name) {
+		endpoint = ctx.GlobalString(utils.IPCPathFlag.Name)
+	}
 
 	config := &node.Config{
 		DataDir: path,