replace old shuffles with rand.Shuffle

addrmgr/addrmanager.go

@@ -713,11 +713,9 @@ func (a *AddrManager) AddressCache() []*NetAddress {
 
 	// Fisher-Yates shuffle the array. We only need to do the first
 	// numAddresses since we are throwing away the rest.
-	for i := 0; i < numAddresses; i++ {
-		// Pick a number between current index and the end.
-		j := rand.IntN(addrLen-i) + i
+	rand.Shuffle(len(allAddr), func(i, j int) {
 		allAddr[i], allAddr[j] = allAddr[j], allAddr[i]
-	}
+	})
 
 	// Slice off the limit we are willing to share.
 	return allAddr[0:numAddresses]

peer/peer.go

@@ -844,10 +844,9 @@ func (p *Peer) PushAddrMsg(addresses []*wire.NetAddress) ([]*wire.NetAddress, er
 	// Randomize the addresses sent if there are more than the maximum allowed.
 	if len(msg.AddrList) > wire.MaxAddrPerMsg {
 		// Shuffle the address list.
-		for i := range msg.AddrList {
-			j := rand.Int64n(int64(i) + 1)
+		rand.Shuffle(len(msg.AddrList), func(i, j int) {
 			msg.AddrList[i], msg.AddrList[j] = msg.AddrList[j], msg.AddrList[i]
-		}
+		})
 
 		// Truncate it to the maximum size.
 		msg.AddrList = msg.AddrList[:wire.MaxAddrPerMsg]