Merge pull request ethereum#214 from jpmorganchase/node-permissioning

Re-enable node permissioning
getamis · Nov 6, 2017 · 6a6b52c · 6a6b52c
2 parents f76983c + 81f0c92
commit 6a6b52c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -114,6 +114,7 @@ var (
 		utils.GpoPercentileFlag,
 		utils.ExtraDataFlag,
 		configFileFlag,
+		utils.EnableNodePermissionFlag,
 		utils.RaftModeFlag,
 		utils.RaftBlockTimeFlag,
 		utils.RaftJoinExistingFlag,

diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
@@ -116,11 +116,9 @@ var AppHelpFlagGroups = []flagGroup{
 		},
 	},
 	{
-		Name: "RAFT",
+		Name: "QUORUM",
 		Flags: []cli.Flag{
-			utils.RaftModeFlag,
-			utils.RaftBlockTimeFlag,
-			utils.RaftJoinExistingFlag,
+			utils.EnableNodePermissionFlag,
 		},
 	},
 	{

diff --git a/p2p/server.go b/p2p/server.go
@@ -739,7 +739,7 @@ func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *discover.Nod
 		if dialDest != nil {
 			node = dialDest.ID.String()
 			direction = "OUTGOING"
-			log.Info("Connection Direction <%v>", direction)
+			log.Trace("Node Permissioning", "Connection Direction", direction)
 		}
 
 		if !isNodePermissioned(node, currentNode, srv.DataDir, direction) {