CR fixes

Author: algorandskiy

network/p2pMetainfo.go

@@ -110,7 +110,7 @@ func writePeerMetaHeaders(stream io.ReadWriter, p2pPeer peer.ID, networkProtoVer
 	length := len(data)
 	if length > math.MaxUint16 {
 		// 64k is enough for everyone
-		// current headers size is TBD
+		// current headers size is 250 bytes
 		msg := fmt.Sprintf("error writing initial message, too large: %v, peer %s", header, p2pPeer)
 		panic(msg)
 	}

network/p2pNetwork.go

@@ -798,8 +798,8 @@ func (n *P2PNetwork) GenesisID() string {
 	return n.genesisID
 }
 
-// NetProtoVersions returns the supported protocol versions of this node.
-func (n *P2PNetwork) NetProtoVersions() []string {
+// SupportedProtoVersions returns the supported protocol versions of this node.
+func (n *P2PNetwork) SupportedProtoVersions() []string {
 	return n.supportedProtocolVersions
 }
 
@@ -842,7 +842,7 @@ func (n *P2PNetwork) wsStreamHandlerV1(ctx context.Context, p2pPeer peer.ID, str
 		}
 	}
 
-	n.wsStreamHandler(ctx, p2pPeer, stream, incoming, peerMetaInfo{})
+	n.baseWsStreamHandler(ctx, p2pPeer, stream, incoming, peerMetaInfo{})
 }
 
 func (n *P2PNetwork) wsStreamHandlerV22(ctx context.Context, p2pPeer peer.ID, stream network.Stream, incoming bool) {
@@ -881,10 +881,10 @@ func (n *P2PNetwork) wsStreamHandlerV22(ctx context.Context, p2pPeer peer.ID, st
 			return
 		}
 	}
-	n.wsStreamHandler(ctx, p2pPeer, stream, incoming, pmi)
+	n.baseWsStreamHandler(ctx, p2pPeer, stream, incoming, pmi)
 }
 
-func (n *P2PNetwork) wsStreamHandler(ctx context.Context, p2pPeer peer.ID, stream network.Stream, incoming bool, pmi peerMetaInfo) {
+func (n *P2PNetwork) baseWsStreamHandler(ctx context.Context, p2pPeer peer.ID, stream network.Stream, incoming bool, pmi peerMetaInfo) {
 	// get address for peer ID
 	ma := stream.Conn().RemoteMultiaddr()
 	addr := ma.String()

network/p2pNetwork_test.go

@@ -40,6 +40,7 @@ import (
 	"github.com/algorand/go-algorand/network/phonebook"
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/test/partitiontest"
+	"github.com/algorand/go-algorand/util/uuid"
 	"github.com/algorand/go-deadlock"
 
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
@@ -1470,6 +1471,8 @@ func TestP2PMetainfoExchange(t *testing.T) {
 	cfg.NetAddress = "127.0.0.1:0"
 	cfg.EnableVoteCompression = true
 	log := logging.TestingLog(t)
+	err := log.EnableTelemetryContext(context.Background(), logging.TelemetryConfig{Enable: true, SendToLog: true, GUID: uuid.New()})
+	require.NoError(t, err)
 	netA, err := NewP2PNetwork(log, cfg, "", nil, genesisID, config.Devtestnet, &nopeNodeInfo{}, nil)
 	require.NoError(t, err)
 	err = netA.Start()

network/wsNetwork.go

@@ -819,7 +819,7 @@ type peerMetadataProvider interface {
 	GenesisID() string
 	PublicAddress() string
 	RandomID() string
-	NetProtoVersions() []string
+	SupportedProtoVersions() []string
 	Config() config.Local
 }
 
@@ -843,8 +843,8 @@ func (wn *WebsocketNetwork) RandomID() string {
 	return wn.randomID
 }
 
-// NetProtoVersions returns the supported protocol versions of this node.
-func (wn *WebsocketNetwork) NetProtoVersions() []string {
+// SupportedProtoVersions returns the supported protocol versions of this node.
+func (wn *WebsocketNetwork) SupportedProtoVersions() []string {
 	return wn.supportedProtocolVersions
 }
 
@@ -876,7 +876,7 @@ func setHeaders(header http.Header, netProtoVer string, meta peerMetadataProvide
 		// for backward compatibility, include the ProtocolVersion header in request as well.
 		header.Set(ProtocolVersionHeader, netProtoVer)
 	}
-	for _, v := range meta.NetProtoVersions() {
+	for _, v := range meta.SupportedProtoVersions() {
 		header.Add(ProtocolAcceptVersionHeader, v)
 	}
 }
@@ -2055,9 +2055,9 @@ func (t *HTTPPAddressBoundTransport) RoundTrip(req *http.Request) (*http.Respons
 // control character, new lines, deletion, etc. All the alpha numeric and punctuation characters
 // are included in this range.
 func filterASCII(unfilteredString string) (filteredString string) {
-	for i, r := range unfilteredString {
+	for _, r := range unfilteredString {
 		if int(r) >= 0x20 && int(r) <= 0x7e {
-			filteredString += string(unfilteredString[i])
+			filteredString += string(r)
 		} else {
 			filteredString += unprintableCharacterGlyph
 		}