Merge pull request docker#145 from thaJeztah/nat_cleanups_2

nat: SortPortMap: don't require PortMap as argument

Author: austinvazquez

nat/sort.go

@@ -55,7 +55,7 @@ func (s portMapSorter) Less(i, j int) bool {
 
 // SortPortMap sorts the list of ports and their respected mapping. The ports
 // will explicit HostPort will be placed first.
-func SortPortMap(ports []Port, bindings PortMap) {
+func SortPortMap(ports []Port, bindings map[Port][]PortBinding) {
 	s := portMapSorter{}
 	for _, p := range ports {
 		if binding, ok := bindings[p]; ok && len(binding) > 0 {

nat/sort_test.go

@@ -50,12 +50,12 @@ func TestSortPortMap(t *testing.T) {
 		"9999/tcp",
 	}
 
-	portMap := PortMap{
-		"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"}},
+	portMap := map[Port][]PortBinding{
+		"22/tcp":   {{}},
+		"8000/tcp": {{}},
+		"8443/tcp": {},
+		"6379/tcp": {{}, {HostIP: "0.0.0.0", HostPort: "32749"}},
+		"9999/tcp": {{HostIP: "0.0.0.0", HostPort: "40000"}},
 	}
 
 	SortPortMap(ports, portMap)
@@ -69,7 +69,7 @@ func TestSortPortMap(t *testing.T) {
 	}) {
 		t.Errorf("failed to prioritize port with explicit mappings, got %v", ports)
 	}
-	if pm := portMap[Port("6379/tcp")]; !reflect.DeepEqual(pm, []PortBinding{
+	if pm := portMap["6379/tcp"]; !reflect.DeepEqual(pm, []PortBinding{
 		{HostIP: "0.0.0.0", HostPort: "32749"},
 		{},
 	}) {