cmd, common, node, rpc: move HTTP RPC into node, drop singletone aspect

2016-02-05 13:45:36 +02:00
parent ba7c125153
commit a13bc9d7a1
10 changed files with 280 additions and 221 deletions
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -503,11 +503,6 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 		}
 	}
 	// Start auxiliary services if enabled
-	if ctx.GlobalBool(utils.RPCEnabledFlag.Name) {
-		if err := utils.StartRPC(stack, ctx); err != nil {
-			utils.Fatalf("Failed to start RPC: %v", err)
-		}
-	}
 	if ctx.GlobalBool(utils.WSEnabledFlag.Name) {
 		if err := utils.StartWS(stack, ctx); err != nil {
 			utils.Fatalf("Failed to start WS: %v", err)