Merge a58dbb1 into f2d694c

fractalplatform · Sep 27, 2019 · 4a4b38b · 4a4b38b
2 parents f2d694c + a58dbb1
commit 4a4b38b
Show file tree

Hide file tree

Showing 3 changed files with 130 additions and 110 deletions.
diff --git a/cmd/ft/p2p.go b/cmd/ft/p2p.go
@@ -28,141 +28,117 @@ var p2pCmd = &cobra.Command{
 	Args:  cobra.NoArgs,
 }
 
-var addCmd = &cobra.Command{
-	Use:   "add <url>",
-	Short: "Connecting to a remote node.",
-	Long:  `Connecting to a remote node.`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_addPeer", args[0])
+var commonCall = func(method string) func(*cobra.Command, []string) {
+	return func(cmd *cobra.Command, args []string) {
+		params := make([]interface{}, len(args))
+		for i, arg := range args {
+			params[i] = arg
+		}
+		result := clientCallRaw(ipcEndpoint, method, params...)
 		printJSON(result)
-	},
+	}
 }
 
-var removeCmd = &cobra.Command{
-	Use:   "remove <url>",
-	Short: "Disconnects from a remote node if the connection exists.",
-	Long:  `Disconnects from a remote node if the connection exists.`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_removePeer", args[0])
-		printJSON(result)
+var p2pSubCmds = []*cobra.Command{
+	&cobra.Command{
+		Use:   "add <url>",
+		Short: "Connecting to a remote node.",
+		Long:  `Connecting to a remote node.`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_addPeer"),
 	},
-}
 
-var addtrustedCmd = &cobra.Command{
-	Use:   "addtrusted <url>",
-	Short: "Allows a remote node to always connect, even if slots are full.",
-	Long:  `Allows a remote node to always connect, even if slots are full.`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_addTrustedPeer", args[0])
-		printJSON(result)
+	&cobra.Command{
+		Use:   "remove <url>",
+		Short: "Disconnects from a remote node if the connection exists.",
+		Long:  `Disconnects from a remote node if the connection exists.`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_removePeer"),
 	},
-}
 
-var removetrustedCmd = &cobra.Command{
-	Use:   "removetrusted <url>",
-	Short: "Removes a remote node from the trusted peer set, but it does not disconnect it automatically.",
-	Long:  `Removes a remote node from the trusted peer set, but it does not disconnect it automatically.`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_removeTrustedPeer", args[0])
-		printJSON(result)
+	&cobra.Command{
+		Use:   "addtrusted <url>",
+		Short: "Allows a remote node to always connect, even if slots are full.",
+		Long:  `Allows a remote node to always connect, even if slots are full.`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_addTrustedPeer"),
 	},
-}
 
-var addbadCmd = &cobra.Command{
-	Use:   "addbad <url>",
-	Short: "Add a bad node in black list.",
-	Long:  `Add a bad node in black list..`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_addBadNode", args[0])
-		printJSON(result)
+	&cobra.Command{
+		Use:   "removetrusted <url>",
+		Short: "Removes a remote node from the trusted peer set, but it does not disconnect it automatically.",
+		Long:  `Removes a remote node from the trusted peer set, but it does not disconnect it automatically.`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_removeTrustedPeer"),
 	},
-}
 
-var removebadCmd = &cobra.Command{
-	Use:   "removebad <url>",
-	Short: "Removes a bad node from the black peer set.",
-	Long:  `Removes a bad node from the black peer set.`,
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		var result bool
-		clientCall(ipcEndpoint, &result, "p2p_removeBadNode", args[0])
-		printJSON(result)
+	&cobra.Command{
+		Use:   "addbad <url>",
+		Short: "Add a bad node in black list.",
+		Long:  `Add a bad node in black list..`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_addBadNode"),
 	},
-}
 
-var countCmd = &cobra.Command{
-	Use:   "count",
-	Short: "Return number of connected peers.",
-	Long:  `Return number of connected peers.`,
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		var result int
-		clientCall(ipcEndpoint, &result, "p2p_peerCount")
-		printJSON(result)
+	&cobra.Command{
+		Use:   "removebad <url>",
+		Short: "Removes a bad node from the black peer set.",
+		Long:  `Removes a bad node from the black peer set.`,
+		Args:  cobra.ExactArgs(1),
+		Run:   commonCall("p2p_removeBadNode"),
 	},
-}
 
-var listCmd = &cobra.Command{
-	Use:   "list",
-	Short: "Return connected peers list.",
-	Long:  `Return connected peers list.`,
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		var result []string
-		clientCall(ipcEndpoint, &result, "p2p_peers")
-		printJSONList(result)
+	&cobra.Command{
+		Use:   "count",
+		Short: "Return number of connected peers.",
+		Long:  `Return number of connected peers.`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_peerCount"),
 	},
-}
 
-var badcountCmd = &cobra.Command{
-	Use:   "badcount",
-	Short: "Return number of bad nodes .",
-	Long:  `Return number of bad nodes .`,
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		var result int
-		clientCall(ipcEndpoint, &result, "p2p_badNodesCount")
-		printJSON(result)
+	&cobra.Command{
+		Use:   "list",
+		Short: "Return connected peers list.",
+		Long:  `Return connected peers list.`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_peers"),
 	},
-}
 
-var badlistCmd = &cobra.Command{
-	Use:   "badlist",
-	Short: "Return bad nodes list.",
-	Long:  `Return bad nodes list.`,
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		var result []string
-		clientCall(ipcEndpoint, &result, "p2p_badNodes")
-		printJSONList(result)
+	&cobra.Command{
+		Use:   "badcount",
+		Short: "Return number of bad nodes .",
+		Long:  `Return number of bad nodes .`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_badNodesCount"),
 	},
-}
 
-var selfnodeCmd = &cobra.Command{
-	Use:   "selfnode",
-	Short: "Return self enode url.",
-	Long:  `Return self enode url.`,
-	Args:  cobra.NoArgs,
-	Run: func(cmd *cobra.Command, args []string) {
-		var result string
-		clientCall(ipcEndpoint, &result, "p2p_selfNode")
-		printJSON(result)
+	&cobra.Command{
+		Use:   "badlist",
+		Short: "Return bad nodes list.",
+		Long:  `Return bad nodes list.`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_badNodes"),
+	},
+
+	&cobra.Command{
+		Use:   "selfnode",
+		Short: "Return self enode url.",
+		Long:  `Return self enode url.`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_selfNode"),
+	},
+
+	&cobra.Command{
+		Use:   "seednodes",
+		Short: "Return seed enode url.",
+		Long:  `Return seed enode url.`,
+		Args:  cobra.NoArgs,
+		Run:   commonCall("p2p_seedNodes"),
 	},
 }
 
 func init() {
 	RootCmd.AddCommand(p2pCmd)
-	p2pCmd.AddCommand(addCmd, removeCmd, addtrustedCmd, removetrustedCmd,
-		addbadCmd, removebadCmd, countCmd, listCmd, badcountCmd, badlistCmd, selfnodeCmd)
+	p2pCmd.AddCommand(p2pSubCmds...)
 	p2pCmd.PersistentFlags().StringVarP(&ipcEndpoint, "ipcpath", "i", defaultIPCEndpoint(params.ClientIdentifier), "IPC Endpoint path")
 }
diff --git a/cmd/ft/utils.go b/cmd/ft/utils.go
@@ -101,6 +101,20 @@ var tomlSettings = toml.Config{
 	},
 }
 
+func clientCallRaw(endpoint string, method string, args ...interface{}) json.RawMessage {
+	client, err := dialRPC(ipcEndpoint)
+	if err != nil {
+		jww.ERROR.Println(err)
+		os.Exit(-1)
+	}
+	msg, err := client.CallRaw(method, args...)
+	if err != nil {
+		jww.ERROR.Println(err)
+		os.Exit(-1)
+	}
+	return msg
+}
+
 func clientCall(endpoint string, result interface{}, method string, args ...interface{}) {
 	client, err := dialRPC(ipcEndpoint)
 	if err != nil {

diff --git a/rpc/client.go b/rpc/client.go
@@ -283,6 +283,36 @@ func (c *Client) Call(result interface{}, method string, args ...interface{}) er
 	return c.CallContext(ctx, result, method, args...)
 }
 
+func (c *Client) CallRaw(method string, args ...interface{}) (json.RawMessage, error) {
+	ctx := context.Background()
+	msg, err := c.newMessage(method, args...)
+	if err != nil {
+		return nil, err
+	}
+	op := &requestOp{ids: []json.RawMessage{msg.ID}, resp: make(chan *jsonrpcMessage, 1)}
+
+	if c.isHTTP {
+		err = c.sendHTTP(ctx, op, msg)
+	} else {
+		err = c.send(ctx, op, msg)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	// dispatch has accepted the request and will close the channel it when it quits.
+	switch resp, err := op.wait(ctx); {
+	case err != nil:
+		return nil, err
+	case resp.Error != nil:
+		return nil, resp.Error
+	case len(resp.Result) == 0:
+		return nil, ErrNoResult
+	default:
+		return resp.Result, nil
+	}
+}
+
 // CallContext performs a JSON-RPC call with the given arguments. If the context is
 // canceled before the call has successfully returned, CallContext returns immediately.
 //