Merge pull request #5435 from multiversx/update_communication_go

Updated mx-chain-communication-go with NetworkType
multiversx · Jul 13, 2023 · e111411 · e111411
2 parents b5720ff + 8186ad1
commit e111411
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/cmd/seednode/main.go b/cmd/seednode/main.go
@@ -268,6 +268,7 @@ func createNode(
 		P2pPrivateKey:         p2pKey,
 		P2pSingleSigner:       p2pSingleSigner,
 		P2pKeyGenerator:       p2pKeyGen,
+		NetworkType:           p2p.MainNetwork,
 		Logger:                logger.GetOrCreate("seed/p2p"),
 	}
 

diff --git a/factory/network/networkComponents.go b/factory/network/networkComponents.go
@@ -236,6 +236,7 @@ func (ncf *networkComponentsFactory) createNetworkHolder(
 	p2pConfig p2pConfig.P2PConfig,
 	logger p2p.Logger,
 	peersRatingHandler p2p.PeersRatingHandler,
+	networkType p2p.NetworkType,
 ) (networkComponentsHolder, error) {
 
 	peersHolder, err := p2pFactory.NewPeersHolder(ncf.preferredPeersSlices)
@@ -254,6 +255,7 @@ func (ncf *networkComponentsFactory) createNetworkHolder(
 		P2pPrivateKey:         ncf.cryptoComponents.P2pPrivateKey(),
 		P2pSingleSigner:       ncf.cryptoComponents.P2pSingleSigner(),
 		P2pKeyGenerator:       ncf.cryptoComponents.P2pKeyGen(),
+		NetworkType:           networkType,
 		Logger:                logger,
 	}
 	networkMessenger, err := p2pFactory.NewNetworkMessenger(argsMessenger)
@@ -269,7 +271,7 @@ func (ncf *networkComponentsFactory) createNetworkHolder(
 
 func (ncf *networkComponentsFactory) createMainNetworkHolder(peersRatingHandler p2p.PeersRatingHandler) (networkComponentsHolder, error) {
 	loggerInstance := logger.GetOrCreate("main/p2p")
-	return ncf.createNetworkHolder(ncf.mainP2PConfig, loggerInstance, peersRatingHandler)
+	return ncf.createNetworkHolder(ncf.mainP2PConfig, loggerInstance, peersRatingHandler, p2p.MainNetwork)
 }
 
 func (ncf *networkComponentsFactory) createFullArchiveNetworkHolder(peersRatingHandler p2p.PeersRatingHandler) (networkComponentsHolder, error) {
@@ -282,7 +284,7 @@ func (ncf *networkComponentsFactory) createFullArchiveNetworkHolder(peersRatingH
 
 	loggerInstance := logger.GetOrCreate("full-archive/p2p")
 
-	return ncf.createNetworkHolder(ncf.fullArchiveP2PConfig, loggerInstance, peersRatingHandler)
+	return ncf.createNetworkHolder(ncf.fullArchiveP2PConfig, loggerInstance, peersRatingHandler, p2p.FullArchiveNetwork)
 }
 
 func (ncf *networkComponentsFactory) createPeersRatingComponents() (p2p.PeersRatingHandler, p2p.PeersRatingMonitor, error) {

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/google/gops v0.3.18
 	github.com/gorilla/websocket v1.5.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230711151847-0a3789df9544
+	github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230713144229-bd674292b50f
 	github.com/multiversx/mx-chain-core-go v1.2.8
 	github.com/multiversx/mx-chain-crypto-go v1.2.7
 	github.com/multiversx/mx-chain-es-indexer-go v1.4.5

diff --git a/go.sum b/go.sum
@@ -622,8 +622,8 @@ github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXS
 github.com/multiversx/concurrent-map v0.1.4 h1:hdnbM8VE4b0KYJaGY5yJS2aNIW9TFFsUYwbO0993uPI=
 github.com/multiversx/concurrent-map v0.1.4/go.mod h1:8cWFRJDOrWHOTNSqgYCUvwT7c7eFQ4U2vKMOp4A/9+o=
 github.com/multiversx/mx-chain-communication-go v1.0.3/go.mod h1:7oTI77XfWmRWwVEbCq+pjH5CO3mJ6vEiHGMvQv6vF3Y=
-github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230711151847-0a3789df9544 h1:E5dIUhpD4BZrxNtMiJnEoTN0RQn8XUa/e2Ago/XQ9O8=
-github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230711151847-0a3789df9544/go.mod h1:7oTI77XfWmRWwVEbCq+pjH5CO3mJ6vEiHGMvQv6vF3Y=
+github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230713144229-bd674292b50f h1:5sNmVZtwRm5PkgENI/y5oAv2KfFLfT24NuH0KpYfdX4=
+github.com/multiversx/mx-chain-communication-go v1.0.4-0.20230713144229-bd674292b50f/go.mod h1:7oTI77XfWmRWwVEbCq+pjH5CO3mJ6vEiHGMvQv6vF3Y=
 github.com/multiversx/mx-chain-core-go v1.1.30/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-core-go v1.2.1/go.mod h1:8gGEQv6BWuuJwhd25qqhCOZbBSv9mk+hLeKvinSaSMk=
 github.com/multiversx/mx-chain-core-go v1.2.5/go.mod h1:jzYFSiYBuO0dGpGFXnZWSwcwcKP7Flyn/X41y4zIQrQ=

diff --git a/p2p/constants.go b/p2p/constants.go
@@ -13,6 +13,15 @@ const NormalOperation = p2p.NormalOperation
 // FullArchiveMode defines the node operation as a full archive mode
 const FullArchiveMode = p2p.FullArchiveMode
 
+// NetworkType defines the type of the network a messenger is running on
+type NetworkType = p2p.NetworkType
+
+// MainNetwork defines the main network
+const MainNetwork NetworkType = "main"
+
+// FullArchiveNetwork defines the full archive network
+const FullArchiveNetwork NetworkType = "full archive"
+
 // ListsSharder is the variant that uses lists
 const ListsSharder = p2p.ListsSharder