From d42ce0f2c1b52e26cce475e411d97165fb975577 Mon Sep 17 00:00:00 2001
From: Oleg Kovalov <iamolegkovalov@gmail.com>
Date: Mon, 30 Jul 2018 11:30:09 +0200
Subject: all: simplify switches (#17267)

* all: simplify switches

* silly mistake
---
 p2p/nat/natpmp.go                  | 3 +--
 p2p/nat/natupnp.go                 | 7 ++-----
 p2p/simulations/adapters/inproc.go | 3 +--
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'p2p')

diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go
index 577a424fb..8ba971472 100644
--- a/p2p/nat/natpmp.go
+++ b/p2p/nat/natpmp.go
@@ -115,8 +115,7 @@ func potentialGateways() (gws []net.IP) {
 			return gws
 		}
 		for _, addr := range ifaddrs {
-			switch x := addr.(type) {
-			case *net.IPNet:
+			if x, ok := addr.(*net.IPNet); ok {
 				if lan10.Contains(x.IP) || lan176.Contains(x.IP) || lan192.Contains(x.IP) {
 					ip := x.IP.Mask(x.Mask).To4()
 					if ip != nil {
diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go
index 69099ac04..029143b7b 100644
--- a/p2p/nat/natupnp.go
+++ b/p2p/nat/natupnp.go
@@ -81,11 +81,8 @@ func (n *upnp) internalAddress() (net.IP, error) {
 			return nil, err
 		}
 		for _, addr := range addrs {
-			switch x := addr.(type) {
-			case *net.IPNet:
-				if x.Contains(devaddr.IP) {
-					return x.IP, nil
-				}
+			if x, ok := addr.(*net.IPNet); ok && x.Contains(devaddr.IP) {
+				return x.IP, nil
 			}
 		}
 	}
diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go
index c1b032a0d..b0fdf49b9 100644
--- a/p2p/simulations/adapters/inproc.go
+++ b/p2p/simulations/adapters/inproc.go
@@ -353,8 +353,7 @@ func (sn *SimNode) NodeInfo() *p2p.NodeInfo {
 }
 
 func setSocketBuffer(conn net.Conn, socketReadBuffer int, socketWriteBuffer int) error {
-	switch v := conn.(type) {
-	case *net.UnixConn:
+	if v, ok := conn.(*net.UnixConn); ok {
 		err := v.SetReadBuffer(socketReadBuffer)
 		if err != nil {
 			return err
-- 
cgit v1.2.3