Merge branch 'master' into collator-tests

enriquefynn · Feb 10, 2018 · d889fe7 · d889fe7
2 parents 3d25788 + 7afef58
commit d889fe7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
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
@@ -49,6 +49,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,

diff --git a/sharding/genesis.json b/sharding/genesis.json