clean up some boolean checks

Author: lukechampine

upnp.go

@@ -74,7 +74,7 @@ func (d *IGD) checkForward(port uint16, proto string) (bool, error) {
 
 	if err != nil {
 		// 714 "NoSuchEntryInArray" means that there is no such forwarding
-		if contained := strings.Contains(err.Error(), "<errorCode>714</errorCode>"); contained == true {
+		if strings.Contains(err.Error(), "<errorCode>714</errorCode>") {
 			return false, nil
 		}
 		return false, err

upnp_test.go

@@ -2,7 +2,6 @@ package upnp
 
 import (
 	"context"
-	"errors"
 	"sync"
 	"testing"
 	"time"
@@ -55,26 +54,18 @@ func TestIGD(t *testing.T) {
 	}
 	t.Log("Your external IP is:", ip)
 
-	// check that port 9001 is not forwarded
-	res, err := d.IsForwardedTCP(9001)
-	if err != nil {
-		t.Fatal(err)
-	} else if res == true {
-		t.Fatal(errors.New("port 9001 is already forwarded"))
-	}
-
 	// forward a port
 	err = d.Forward(9001, "upnp test")
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// check that port 9001 is now forwarded
-	res, err = d.IsForwardedTCP(9001)
+	forwarded, err := d.IsForwardedTCP(9001)
 	if err != nil {
 		t.Fatal(err)
-	} else if res == false {
-		t.Fatal(errors.New("port 9001 was not reported as forwarded"))
+	} else if !forwarded {
+		t.Fatal("port 9001 was not reported as forwarded")
 	}
 
 	// un-forward a port
@@ -84,11 +75,11 @@ func TestIGD(t *testing.T) {
 	}
 
 	// check that port 9001 is no longer forwarded
-	res, err = d.IsForwardedTCP(9001)
+	forwarded, err = d.IsForwardedTCP(9001)
 	if err != nil {
 		t.Fatal(err)
-	} else if res == true {
-		t.Fatal(errors.New("port 9001 is still forwarded"))
+	} else if forwarded {
+		t.Fatal("port 9001 should no longer be forwarded")
 	}
 
 	// record router's location