From 2a53f1d10ae60082a6d6260ff9fa3897589bc8b0 Mon Sep 17 00:00:00 2001
From: Kejie Zhang <601172892@qq.com>
Date: Thu, 27 Sep 2018 19:53:16 +0800
Subject: [PATCH] refactor p2p command code

License: MIT
Signed-off-by: Kejie Zhang <601172892@qq.com>
---
 core/commands/p2p.go | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/core/commands/p2p.go b/core/commands/p2p.go
index 0877bd44b637..13ff1262d5ea 100644
--- a/core/commands/p2p.go
+++ b/core/commands/p2p.go
@@ -49,6 +49,14 @@ type P2PStreamsOutput struct {
 	Streams []P2PStreamInfoOutput
 }
 
+var (
+	allowCustomProtocolOptionName = "allow-custom-protocol"
+	allOptionName                 = "all"
+	protocolOptionName            = "protocol"
+	listenAddressOptionName       = "listen-address"
+	targetAddressOptionName       = "target-address"
+)
+
 // P2PCmd is the 'ipfs p2p' command
 var P2PCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
@@ -91,7 +99,7 @@ Example:
 		cmdkit.StringArg("target-address", true, false, "Target endpoint."),
 	},
 	Options: []cmdkit.Option{
-		cmdkit.BoolOption("allow-custom-protocol", "Don't require /x/ prefix"),
+		cmdkit.BoolOption(allowCustomProtocolOptionName, "Don't require /x/ prefix"),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := p2pGetNode(req)
@@ -118,7 +126,7 @@ Example:
 			return
 		}
 
-		allowCustom, _, err := req.Option("allow-custom-protocol").Bool()
+		allowCustom, _, err := req.Option(allowCustomProtocolOptionName).Bool()
 		if err != nil {
 			res.SetError(err, cmdkit.ErrNormal)
 			return
@@ -156,7 +164,7 @@ Example:
 		cmdkit.StringArg("target-address", true, false, "Target endpoint."),
 	},
 	Options: []cmdkit.Option{
-		cmdkit.BoolOption("allow-custom-protocol", "Don't require /x/ prefix"),
+		cmdkit.BoolOption(allowCustomProtocolOptionName, "Don't require /x/ prefix"),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := p2pGetNode(req)
@@ -176,7 +184,7 @@ Example:
 			return
 		}
 
-		allowCustom, _, err := req.Option("allow-custom-protocol").Bool()
+		allowCustom, _, err := req.Option(allowCustomProtocolOptionName).Bool()
 		if err != nil {
 			res.SetError(err, cmdkit.ErrNormal)
 			return
@@ -283,10 +291,10 @@ var p2pCloseCmd = &cmds.Command{
 		Tagline: "Stop listening for new connections to forward.",
 	},
 	Options: []cmdkit.Option{
-		cmdkit.BoolOption("all", "a", "Close all listeners."),
-		cmdkit.StringOption("protocol", "p", "Match protocol name"),
-		cmdkit.StringOption("listen-address", "l", "Match listen address"),
-		cmdkit.StringOption("target-address", "t", "Match target address"),
+		cmdkit.BoolOption(allOptionName, "a", "Close all listeners."),
+		cmdkit.StringOption(protocolOptionName, "p", "Match protocol name"),
+		cmdkit.StringOption(listenAddressOptionName, "l", "Match listen address"),
+		cmdkit.StringOption(targetAddressOptionName, "t", "Match target address"),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := p2pGetNode(req)
@@ -295,10 +303,10 @@ var p2pCloseCmd = &cmds.Command{
 			return
 		}
 
-		closeAll, _, _ := req.Option("all").Bool()
-		protoOpt, p, _ := req.Option("protocol").String()
-		listenOpt, l, _ := req.Option("listen-address").String()
-		targetOpt, t, _ := req.Option("target-address").String()
+		closeAll, _, _ := req.Option(allOptionName).Bool()
+		protoOpt, p, _ := req.Option(protocolOptionName).String()
+		listenOpt, l, _ := req.Option(listenAddressOptionName).String()
+		targetOpt, t, _ := req.Option(targetAddressOptionName).String()
 
 		proto := protocol.ID(protoOpt)