- fixes after review

multiversx · Jul 4, 2023 · 38ba79c · 38ba79c
1 parent 8189d3c
commit 38ba79c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -11,10 +11,10 @@ jobs:
     name: Unit tests without race detector
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.3
+      - name: Set up Go 1.20.5
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.3
+          go-version: 1.20.5
         id: go
 
       - name: Check out code
@@ -29,10 +29,10 @@ jobs:
     name: Unit tests with race detector
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.20.3
+      - name: Set up Go 1.20.5
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.3
+          go-version: 1.20.5
         id: go
 
       - name: Check out code

diff --git a/constants.go b/constants.go
@@ -12,6 +12,9 @@ const NormalOperation NodeOperation = "normal operation"
 const FullArchiveMode NodeOperation = "full archive mode"
 
 const (
+	// LocalHostListenAddrWithIp4AndTcp defines the local host listening ip v.4 address and TCP
+	LocalHostListenAddrWithIp4AndTcp = "/ip4/127.0.0.1/tcp/%d"
+
 	displayLastPidChars = 12
 
 	// ListsSharder is the variant that uses lists

diff --git a/integrationTests/peerConnections/peerConnections_test.go b/integrationTests/peerConnections/peerConnections_test.go
@@ -58,7 +58,7 @@ func TestPeerConnectionsOnAllSupportedProtocolsShouldExchangeData(t *testing.T)
 	seederArgs := createBaseArgs()
 	seederArgs.P2pConfig.Node.Transports = config.TransportConfig{
 		TCP: config.TCPProtocolConfig{
-			ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+			ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 		},
 		QUICAddress:         "/ip4/127.0.0.1/udp/%d/quic-v1",
 		WebSocketAddress:    "/ip4/127.0.0.1/tcp/%d/ws",
@@ -71,7 +71,7 @@ func TestPeerConnectionsOnAllSupportedProtocolsShouldExchangeData(t *testing.T)
 	tcpPeerArgs := createBaseArgs()
 	tcpPeerArgs.P2pConfig.Node.Transports = config.TransportConfig{
 		TCP: config.TCPProtocolConfig{
-			ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+			ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 		},
 	}
 	tcpPeer, err := libp2p.NewNetworkMessenger(tcpPeerArgs)

diff --git a/integrationTests/peerDisconnecting/peerDisconnecting_test.go b/integrationTests/peerDisconnecting/peerDisconnecting_test.go
@@ -20,7 +20,7 @@ func createDefaultConfig() config.P2PConfig {
 		Node: config.NodeConfig{
 			Transports: config.TransportConfig{
 				TCP: config.TCPProtocolConfig{
-					ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+					ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 				},
 			},
 		},

diff --git a/integrationTests/testCommon.go b/integrationTests/testCommon.go
@@ -27,7 +27,7 @@ func createP2PConfig(initialPeerList []string) config.P2PConfig {
 			Port: "0",
 			Transports: config.TransportConfig{
 				TCP: config.TCPProtocolConfig{
-					ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+					ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 				},
 			},
 		},
@@ -169,7 +169,7 @@ func createP2PConfigWithNoDiscovery() config.P2PConfig {
 			Port: "0",
 			Transports: config.TransportConfig{
 				TCP: config.TCPProtocolConfig{
-					ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+					ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 				},
 			},
 		},

diff --git a/libp2p/goroutines/goroutines_test.go b/libp2p/goroutines/goroutines_test.go
@@ -34,7 +34,7 @@ func createDefaultConfig() config.P2PConfig {
 		Node: config.NodeConfig{
 			Transports: config.TransportConfig{
 				TCP: config.TCPProtocolConfig{
-					ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+					ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 				},
 			},
 			Port: "0",

diff --git a/libp2p/netMessenger.go b/libp2p/netMessenger.go
@@ -40,9 +40,6 @@ import (
 )
 
 const (
-	// TestListenAddrWithIp4AndTcp defines the local host listening ip v.4 address and TCP used in testing
-	TestListenAddrWithIp4AndTcp = "/ip4/127.0.0.1/tcp/%d"
-
 	// DirectSendID represents the protocol ID for sending and receiving direct P2P messages
 	DirectSendID = protocol.ID("/erd/directsend/1.0.0")
 

diff --git a/libp2p/netMessenger_test.go b/libp2p/netMessenger_test.go
@@ -81,7 +81,7 @@ func prepareMessengerForMatchDataReceive(messenger p2p.Messenger, matchData []by
 				}
 
 				// do not print the message.Data() or matchData as the test TestLibp2pMessenger_BroadcastDataBetween2PeersWithLargeMsgShouldWork
-				// will cause disruption on the github action page
+				// will cause disruption on the GitHub action page
 
 				wg.Done()
 
@@ -106,7 +106,7 @@ func getConnectableAddress(messenger p2p.Messenger) string {
 func createTestTCPTransportConfig() config.TransportConfig {
 	return config.TransportConfig{
 		TCP: config.TCPProtocolConfig{
-			ListenAddress: libp2p.TestListenAddrWithIp4AndTcp,
+			ListenAddress: p2p.LocalHostListenAddrWithIp4AndTcp,
 		},
 	}
 }
@@ -2215,7 +2215,7 @@ func TestParseTransportOptions(t *testing.T) {
 			options, addresses, err := libp2p.ParseTransportOptions(
 				config.TransportConfig{
 					TCP: config.TCPProtocolConfig{
-						ListenAddress:    libp2p.TestListenAddrWithIp4AndTcp,
+						ListenAddress:    p2p.LocalHostListenAddrWithIp4AndTcp,
 						PreventPortReuse: true,
 					},
 				}, 100)
@@ -2228,7 +2228,7 @@ func TestParseTransportOptions(t *testing.T) {
 			options, addresses, err := libp2p.ParseTransportOptions(
 				config.TransportConfig{
 					TCP: config.TCPProtocolConfig{
-						ListenAddress:    libp2p.TestListenAddrWithIp4AndTcp,
+						ListenAddress:    p2p.LocalHostListenAddrWithIp4AndTcp,
 						PreventPortReuse: false,
 					},
 				}, 100)