feedback from initial CR

algorand · Mar 24, 2023 · 4806884 · 4806884
1 parent f386d98
commit 4806884
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/network/wsNetwork_test.go b/network/wsNetwork_test.go
@@ -3795,9 +3795,8 @@ func TestUpdatePhonebookAddresses(t *testing.T) {
 		for pi, peer := range relayPeers {
 			relayAddrs[pi] = peer.(HTTPPeer).GetAddress()
 		}
-		sort.Strings(relayAddrs)
-		sort.Strings(dedupedRelayDomains)
-		assert.Equal(t, dedupedRelayDomains, relayAddrs)
+
+		assert.ElementsMatch(t, dedupedRelayDomains, relayAddrs)
 
 		archivePeers = netA.GetPeers(PeersPhonebookArchivers)
 		assert.Equal(t, len(dedupedArchiveDomains), len(archivePeers))
@@ -3806,9 +3805,8 @@ func TestUpdatePhonebookAddresses(t *testing.T) {
 		for pi, peer := range archivePeers {
 			archiveAddrs[pi] = peer.(HTTPPeer).GetAddress()
 		}
-		sort.Strings(archiveAddrs)
-		sort.Strings(dedupedArchiveDomains)
-		assert.Equal(t, dedupedArchiveDomains, archiveAddrs)
+
+		assert.ElementsMatch(t, dedupedArchiveDomains, archiveAddrs)
 
 		// Generate fresh set of addresses with a duplicate from original batch if warranted,
 		// assert phonebook reflects fresh list / prior peers other than selected duplicate
@@ -3834,9 +3832,8 @@ func TestUpdatePhonebookAddresses(t *testing.T) {
 		for pi, peer := range relayPeers {
 			relayAddrs[pi] = peer.(HTTPPeer).GetAddress()
 		}
-		sort.Strings(relayAddrs)
-		sort.Strings(dedupedRelayDomains)
-		assert.Equal(t, dedupedRelayDomains, relayAddrs)
+
+		assert.ElementsMatch(t, dedupedRelayDomains, relayAddrs)
 
 		archivePeers = netA.GetPeers(PeersPhonebookArchivers)
 		assert.Equal(t, len(dedupedArchiveDomains), len(archivePeers))
@@ -3845,9 +3842,8 @@ func TestUpdatePhonebookAddresses(t *testing.T) {
 		for pi, peer := range archivePeers {
 			archiveAddrs[pi] = peer.(HTTPPeer).GetAddress()
 		}
-		sort.Strings(archiveAddrs)
-		sort.Strings(dedupedArchiveDomains)
-		assert.Equal(t, dedupedArchiveDomains, archiveAddrs)
+
+		assert.ElementsMatch(t, dedupedArchiveDomains, archiveAddrs)
 	})
 }
 
@@ -3904,10 +3900,7 @@ func TestMergePrimarySecondaryRelayAddressListsMinOverlap(t *testing.T) {
 
 		expectedRelayAddresses := removeDuplicateStr(append(primaryRelayAddresses, secondaryRelayAddresses...), true)
 
-		sort.Strings(expectedRelayAddresses)
-		sort.Strings(mergedRelayAddresses)
-
-		assert.Equal(t, expectedRelayAddresses, mergedRelayAddresses)
+		assert.ElementsMatch(t, expectedRelayAddresses, mergedRelayAddresses)
 	})
 }
 
@@ -3942,9 +3935,6 @@ func TestMergePrimarySecondaryRelayAddressListsPartialOverlap(t *testing.T) {
 		// secondary addresses should be present in the merged slice
 		expectedRelayAddresses := removeDuplicateStr(append(primaryRelayAddresses, generatedSecondaryRelayAddresses...), true)
 
-		sort.Strings(expectedRelayAddresses)
-		sort.Strings(mergedRelayAddresses)
-
-		assert.Equal(t, expectedRelayAddresses, mergedRelayAddresses)
+		assert.ElementsMatch(t, expectedRelayAddresses, mergedRelayAddresses)
 	})
 }