commands/p2p(fix): avoid creating empty multiaddrs

3aef795c · Steven Allen · b892db89 · 3aef795c
Commit 3aef795c authored May 20, 2019 by Steven Allen
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

core/commands/p2p.go core/commands/p2p.go +14 -6

No files found.
--- a/core/commands/p2p.go
+++ b/core/commands/p2p.go
@@ -357,14 +357,22 @@ var p2pCloseCmd = &cmds.Command{

 		proto := protocol.ID(protoOpt)

-		listen, err := ma.NewMultiaddr(listenOpt)
-		if err != nil {
-			return err
+		var (
+			target, listen ma.Multiaddr
+		)
+
+		if l {
+			listen, err = ma.NewMultiaddr(listenOpt)
+			if err != nil {
+				return err
+			}
 		}

-		target, err := ma.NewMultiaddr(targetOpt)
-		if err != nil {
-			return err
+		if t {
+			target, err = ma.NewMultiaddr(targetOpt)
+			if err != nil {
+				return err
+			}
 		}

 		if !(closeAll || p || l || t) {