Merge pull request #145 from marten-seemann/more-linter-fixes

more linter fixes

go.mod

@@ -5,7 +5,6 @@ go 1.13
 require (
 	github.com/ipfs/go-cid v0.0.7
 	github.com/libp2p/go-maddr-filter v0.1.0
-	github.com/multiformats/go-multiaddr-net v0.2.0
 	github.com/multiformats/go-multihash v0.0.14
 	github.com/multiformats/go-varint v0.0.6
 )

go.sum

@@ -14,15 +14,11 @@ github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
 github.com/multiformats/go-multiaddr v0.2.2/go.mod h1:NtfXiOtHvghW9KojvtySjH5y0u0xW5UouOmQQrn6a3Y=
-github.com/multiformats/go-multiaddr v0.3.0/go.mod h1:dF9kph9wfJ+3VLAaeBqo9Of8x4fJxp6ggJGteB8HQTI=
-github.com/multiformats/go-multiaddr-net v0.2.0 h1:MSXRGN0mFymt6B1yo/6BPnIRpLPEnKgQNvVfCX5VDJk=
-github.com/multiformats/go-multiaddr-net v0.2.0/go.mod h1:gGdH3UXny6U3cKKYCvpXI5rnK7YaOIEOPVDI9tsJbEA=
 github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
 github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
 github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
 github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
 github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=

internal/codependencies/codependencies.go

@@ -3,8 +3,6 @@ package codependencies
 import (
 	// Packages imported into this package.
 
-	// go-multiaddr-net < 0.2.0 conflict with this package.
-	_ "github.com/multiformats/go-multiaddr-net"
 	// go-maddr-filter < 0.1.0 conflicts with this package.
 	_ "github.com/libp2p/go-maddr-filter"
 )

multiaddr/main.go

@@ -36,19 +36,19 @@ Options:
 
 	addrStr := flag.Args()[0]
 	var addr maddr.Multiaddr
-	var err error
+	var merr error
 	if strings.HasPrefix(addrStr, "0x") {
 		addrBytes, err := hex.DecodeString(addrStr[2:])
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "parse error: %s\n", err)
 			os.Exit(1)
 		}
-		addr, err = maddr.NewMultiaddrBytes(addrBytes)
+		addr, merr = maddr.NewMultiaddrBytes(addrBytes)
 	} else {
-		addr, err = maddr.NewMultiaddr(addrStr)
+		addr, merr = maddr.NewMultiaddr(addrStr)
 	}
-	if err != nil {
+	if merr != nil {
-		fmt.Fprintf(os.Stderr, "parse error: %s\n", err)
+		fmt.Fprintf(os.Stderr, "parse error: %s\n", merr)
 		os.Exit(1)
 	}
 

net/net_test.go

@@ -32,10 +32,9 @@ func TestDial(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-
 		cB, err := listener.Accept()
 		if err != nil {
-			t.Fatal("failed to accept")
+			t.Error("failed to accept")
 		}
 
 		// echo out
@@ -99,19 +98,19 @@ func TestUnixSockets(t *testing.T) {
 	go func() {
 		conn, err := listener.Accept()
 		if err != nil {
-			t.Fatal(err)
+			t.Error(err)
 		}
 		defer conn.Close()
 		buf := make([]byte, 1024)
 		n, err := conn.Read(buf)
 		if err != nil {
-			t.Fatal(err)
+			t.Error(err)
 		}
 		if n != len(payload) {
-			t.Fatal("failed to read appropriate number of bytes")
+			t.Error("failed to read appropriate number of bytes")
 		}
 		if !bytes.Equal(buf[0:n], payload) {
-			t.Fatal("payload did not match")
+			t.Error("payload did not match")
 		}
 		done <- struct{}{}
 	}()
@@ -146,14 +145,13 @@ func TestListen(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-
 		cB, err := listener.Accept()
 		if err != nil {
-			t.Fatal("failed to accept")
+			t.Error("failed to accept")
 		}
 
 		if !cB.LocalMultiaddr().Equal(maddr) {
-			t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
+			t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
 		}
 
 		// echo out
@@ -267,14 +265,13 @@ func TestListenAndDial(t *testing.T) {
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
-
 		cB, err := listener.Accept()
 		if err != nil {
-			t.Fatal("failed to accept")
+			t.Error("failed to accept")
 		}
 
 		if !cB.LocalMultiaddr().Equal(maddr) {
-			t.Fatal("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
+			t.Error("local multiaddr not equal:", maddr, cB.LocalMultiaddr())
 		}
 
 		// echo out
@@ -329,13 +326,13 @@ func TestListenPacketAndDial(t *testing.T) {
 
 	go func() {
 		if !pc.LocalMultiaddr().Equal(maddr) {
-			t.Fatal("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
+			t.Error("connection multiaddr not equal:", maddr, pc.LocalMultiaddr())
 		}
 
 		buffer := make([]byte, 1024)
 		_, addr, err := pc.ReadFrom(buffer)
 		if err != nil {
-			t.Fatal("failed to read into buffer", err)
+			t.Error("failed to read into buffer", err)
 		}
 		pc.WriteTo(buffer, addr)
 
@@ -633,16 +630,16 @@ func TestNetListener(t *testing.T) {
 	go func() {
 		c, err := Dial(malist.Multiaddr())
 		if err != nil {
-			t.Fatal("failed to dial")
+			t.Error("failed to dial")
 		}
 		if !c.RemoteMultiaddr().Equal(malist.Multiaddr()) {
-			t.Fatal("dialed wrong target")
+			t.Error("dialed wrong target")
 		}
 		c.Close()
 
 		c, err = Dial(malist.Multiaddr())
 		if err != nil {
-			t.Fatal("failed to dial")
+			t.Error("failed to dial")
 		}
 		c.Close()
 	}()

net/private.go

@@ -72,8 +72,6 @@ func IsPublicAddr(a ma.Multiaddr) bool {
 		switch c.Protocol().Code {
 		case ma.P_IP6ZONE:
 			return true
-		default:
-			return false
 		case ma.P_IP4:
 			ip := net.IP(c.RawValue())
 			isPublic = !inAddrRange(ip, Private4) && !inAddrRange(ip, Unroutable4)
@@ -93,8 +91,6 @@ func IsPrivateAddr(a ma.Multiaddr) bool {
 		switch c.Protocol().Code {
 		case ma.P_IP6ZONE:
 			return true
-		default:
-			return false
 		case ma.P_IP4:
 			isPrivate = inAddrRange(net.IP(c.RawValue()), Private4)
 		case ma.P_IP6:

net/registry.go

@@ -31,7 +31,6 @@ func init() {
 // It is used to keep a list of supported network address codecs (protocols
 // which addresses can be converted to and from multiaddresses).
 type CodecMap struct {
-	codecs       map[string]*NetCodec
 	addrParsers  map[string]FromNetAddrFunc
 	maddrParsers map[string]ToNetAddrFunc
 	lk           sync.Mutex