nat: remove redundant type-conversions

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

nat/nat_test.go

@@ -367,15 +367,15 @@ func TestParsePortSpecs(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1234/tcp")]; !ok {
+	if _, ok := portMap["1234/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2345/udp")]; !ok {
+	if _, ok := portMap["2345/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 
@@ -398,15 +398,15 @@ func TestParsePortSpecs(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1234/tcp")]; !ok {
+	if _, ok := portMap["1234/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2345/udp")]; !ok {
+	if _, ok := portMap["2345/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 
@@ -431,15 +431,15 @@ func TestParsePortSpecs(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1234/tcp")]; !ok {
+	if _, ok := portMap["1234/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2345/udp")]; !ok {
+	if _, ok := portMap["2345/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 
@@ -478,15 +478,15 @@ func TestParsePortSpecsWithRange(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1235/tcp")]; !ok {
+	if _, ok := portMap["1235/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2346/udp")]; !ok {
+	if _, ok := portMap["2346/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 
@@ -509,15 +509,15 @@ func TestParsePortSpecsWithRange(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1235/tcp")]; !ok {
+	if _, ok := portMap["1235/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2346/udp")]; !ok {
+	if _, ok := portMap["2346/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 
@@ -541,15 +541,15 @@ func TestParsePortSpecsWithRange(t *testing.T) {
 		t.Fatalf("Error while processing ParsePortSpecs: %s", err)
 	}
 
-	if _, ok := portMap[Port("1235/tcp")]; !ok {
+	if _, ok := portMap["1235/tcp"]; !ok {
 		t.Fatal("1234/tcp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("2346/udp")]; !ok {
+	if _, ok := portMap["2346/udp"]; !ok {
 		t.Fatal("2345/udp was not parsed properly")
 	}
 
-	if _, ok := portMap[Port("3456/sctp")]; !ok {
+	if _, ok := portMap["3456/sctp"]; !ok {
 		t.Fatal("3456/sctp was not parsed properly")
 	}
 

nat/sort_test.go

@@ -1,71 +1,61 @@
 package nat
 
 import (
-	"fmt"
 	"reflect"
 	"testing"
 )
 
 func TestSortUniquePorts(t *testing.T) {
 	ports := []Port{
-		Port("6379/tcp"),
-		Port("22/tcp"),
+		"6379/tcp",
+		"22/tcp",
 	}
 
 	Sort(ports, func(ip, jp Port) bool {
 		return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && ip.Proto() == "tcp")
 	})
 
 	first := ports[0]
-	if fmt.Sprint(first) != "22/tcp" {
-		t.Log(fmt.Sprint(first))
+	if string(first) != "22/tcp" {
+		t.Log(first)
 		t.Fail()
 	}
 }
 
 func TestSortSamePortWithDifferentProto(t *testing.T) {
 	ports := []Port{
-		Port("8888/tcp"),
-		Port("8888/udp"),
-		Port("6379/tcp"),
-		Port("6379/udp"),
+		"8888/tcp",
+		"8888/udp",
+		"6379/tcp",
+		"6379/udp",
 	}
 
 	Sort(ports, func(ip, jp Port) bool {
 		return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && ip.Proto() == "tcp")
 	})
 
 	first := ports[0]
-	if fmt.Sprint(first) != "6379/tcp" {
+	if string(first) != "6379/tcp" {
 		t.Fail()
 	}
 }
 
 func TestSortPortMap(t *testing.T) {
 	ports := []Port{
-		Port("22/tcp"),
-		Port("22/udp"),
-		Port("8000/tcp"),
-		Port("8443/tcp"),
-		Port("6379/tcp"),
-		Port("9999/tcp"),
+		"22/tcp",
+		"22/udp",
+		"8000/tcp",
+		"8443/tcp",
+		"6379/tcp",
+		"9999/tcp",
 	}
 
 	portMap := PortMap{
-		Port("22/tcp"): []PortBinding{
-			{},
-		},
-		Port("8000/tcp"): []PortBinding{
-			{},
-		},
-		Port("8443/tcp"): []PortBinding{},
-		Port("6379/tcp"): []PortBinding{
-			{},
-			{HostIP: "0.0.0.0", HostPort: "32749"},
-		},
-		Port("9999/tcp"): []PortBinding{
-			{HostIP: "0.0.0.0", HostPort: "40000"},
-		},
+		"22/tcp":   []PortBinding{{}},
+		"8000/tcp": []PortBinding{{}},
+		"8443/tcp": []PortBinding{},
+		"6379/tcp": []PortBinding{{}, {HostIP: "0.0.0.0", HostPort: "32749"}},
+		"9999/tcp": []PortBinding{{HostIP: "0.0.0.0", HostPort: "40000"}},
 	}
 
 	SortPortMap(ports, portMap)