cr fixes

Author: algorandskiy

network/hybridNetwork.go

@@ -49,18 +49,18 @@ func NewHybridP2PNetwork(log logging.Logger, cfg config.Local, datadir string, p
 	p2pcfg.IncomingConnectionsLimit = cfg.P2PHybridIncomingConnectionsLimit
 	identityTracker := NewIdentityTracker()
 
-	var subnetMeshCreator MeshCreator = meshCreator
+	var childNetMeshCreator MeshCreator = meshCreator
 	var hybridMeshCreator MeshCreator = &noopMeshCreator{}
-	_, isHybridMeshCreator := meshCreator.(*HybridRelayMeshCreator)
+	_, isHybridMeshCreator := meshCreator.(*hybridRelayMeshCreator)
 	if meshCreator == nil && cfg.IsHybridServer() || isHybridMeshCreator {
 		// no mesh creator provided and this node is a listening/relaying node
 		// then override and use hybrid relay meshing
 		// or, if a hybrid relay meshing requested explicitly, do the same
-		subnetMeshCreator = &noopMeshCreator{}
-		hybridMeshCreator = &HybridRelayMeshCreator{}
+		childNetMeshCreator = &noopMeshCreator{}
+		hybridMeshCreator = &hybridRelayMeshCreator{}
 	}
 
-	p2pnet, err := NewP2PNetwork(log, p2pcfg, datadir, phonebookAddresses, genesisInfo, nodeInfo, &identityOpts{tracker: identityTracker}, subnetMeshCreator)
+	p2pnet, err := NewP2PNetwork(log, p2pcfg, datadir, phonebookAddresses, genesisInfo, nodeInfo, &identityOpts{tracker: identityTracker}, childNetMeshCreator)
 	if err != nil {
 		return nil, err
 	}
@@ -69,7 +69,7 @@ func NewHybridP2PNetwork(log logging.Logger, cfg config.Local, datadir string, p
 		tracker: identityTracker,
 		scheme:  NewIdentityChallengeScheme(NetIdentityDedupNames(cfg.PublicAddress, p2pnet.PeerID().String()), NetIdentitySigner(p2pnet.PeerIDSigner())),
 	}
-	wsnet, err := NewWebsocketNetwork(log, cfg, phonebookAddresses, genesisInfo, nodeInfo, &identOpts, subnetMeshCreator)
+	wsnet, err := NewWebsocketNetwork(log, cfg, phonebookAddresses, genesisInfo, nodeInfo, &identOpts, childNetMeshCreator)
 	if err != nil {
 		return nil, err
 	}

network/hybridNetwork_test.go

@@ -47,7 +47,7 @@ func TestHybridNetwork_DuplicateConn(t *testing.T) {
 
 	relayCfg := cfg
 	relayCfg.ForceRelayMessages = true
-	netA, err := NewHybridP2PNetwork(log.With("node", "netA"), relayCfg, p2pKeyDir, nil, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	netA, err := NewHybridP2PNetwork(log.With("node", "netA"), relayCfg, p2pKeyDir, nil, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.NoError(t, err)
 
 	err = netA.Start()
@@ -66,7 +66,7 @@ func TestHybridNetwork_DuplicateConn(t *testing.T) {
 	relayCfg.NetAddress = addr
 	relayCfg.PublicAddress = addr
 	relayCfg.P2PHybridNetAddress = "127.0.0.1:0"
-	netA, err = NewHybridP2PNetwork(log.With("node", "netA"), relayCfg, p2pKeyDir, nil, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	netA, err = NewHybridP2PNetwork(log.With("node", "netA"), relayCfg, p2pKeyDir, nil, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.NoError(t, err)
 
 	err = netA.Start()
@@ -87,14 +87,14 @@ func TestHybridNetwork_DuplicateConn(t *testing.T) {
 
 	phoneBookAddresses := []string{multiAddrStr, addr}
 
-	netB, err := NewHybridP2PNetwork(log.With("node", "netB"), cfg, "", phoneBookAddresses, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	netB, err := NewHybridP2PNetwork(log.With("node", "netB"), cfg, "", phoneBookAddresses, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.NoError(t, err)
 	// for netB start the p2p network first
 	err = netB.p2pNetwork.Start()
 	require.NoError(t, err)
 	defer netB.Stop()
 
-	netC, err := NewHybridP2PNetwork(log.With("node", "netC"), cfg, "", phoneBookAddresses, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	netC, err := NewHybridP2PNetwork(log.With("node", "netC"), cfg, "", phoneBookAddresses, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.NoError(t, err)
 	// for netC start the ws network first
 	err = netC.wsNetwork.Start()
@@ -193,12 +193,12 @@ func TestHybridNetwork_ValidateConfig(t *testing.T) {
 	cfg.P2PHybridNetAddress = ""
 	genesisInfo := GenesisInfo{genesisID, "net"}
 
-	_, err := NewHybridP2PNetwork(logging.TestingLog(t), cfg, "", nil, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	_, err := NewHybridP2PNetwork(logging.TestingLog(t), cfg, "", nil, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.ErrorContains(t, err, "both NetAddress and P2PHybridNetAddress")
 
 	cfg.NetAddress = ""
 	cfg.P2PHybridNetAddress = ":0"
-	_, err = NewHybridP2PNetwork(logging.TestingLog(t), cfg, "", nil, genesisInfo, &nopeNodeInfo{}, &BaseMeshCreator{})
+	_, err = NewHybridP2PNetwork(logging.TestingLog(t), cfg, "", nil, genesisInfo, &nopeNodeInfo{}, &baseMeshCreator{})
 	require.ErrorContains(t, err, "both NetAddress and P2PHybridNetAddress")
 }
 

network/mesh.go

@@ -188,20 +188,19 @@ type MeshCreator interface {
 	create(opts ...meshOption) (mesher, error)
 }
 
-// BaseMeshCreator is a creator for the base mesh strategy used in our standard WS or P2P implementations:
+// baseMeshCreator is a creator for the base mesh strategy used in our standard WS or P2P implementations:
 // run a mesh thread that periodically checks for new peers.
-type BaseMeshCreator struct {
-}
+type baseMeshCreator struct{}
 
-func (c *BaseMeshCreator) create(opts ...meshOption) (mesher, error) {
+func (c *baseMeshCreator) create(opts ...meshOption) (mesher, error) {
 	return newBaseMesher(opts...)
 }
 
-// HybridRelayMeshCreator is a creator for the hybrid relay mesh strategy used in hybrid relays:
+// hybridRelayMeshCreator is a creator for the hybrid relay mesh strategy used in hybrid relays:
 // always use wsnet nodes
-type HybridRelayMeshCreator struct{}
+type hybridRelayMeshCreator struct{}
 
-func (c *HybridRelayMeshCreator) create(opts ...meshOption) (mesher, error) {
+func (c *hybridRelayMeshCreator) create(opts ...meshOption) (mesher, error) {
 	var cfg meshConfig
 	for _, opt := range opts {
 		opt(&cfg)
@@ -214,9 +213,8 @@ func (c *HybridRelayMeshCreator) create(opts ...meshOption) (mesher, error) {
 	out := make(chan meshRequest, 5)
 	var wg sync.WaitGroup
 
-	creator := BaseMeshCreator{}
 	ctx := cfg.wsnet.ctx
-	mesh, err := creator.create(
+	mesh, err := newBaseMesher(
 		withContext(ctx),
 		withMeshNetMeshFn(cfg.wsnet.meshThreadInner),
 		withMeshPeerStatReporter(func() {
@@ -266,7 +264,5 @@ func (c *noopMeshCreator) create(opts ...meshOption) (mesher, error) {
 
 type noopMesh struct{}
 
-func (m *noopMesh) start() {
-}
-func (m *noopMesh) stop() {
-}
+func (m *noopMesh) start() {}
+func (m *noopMesh) stop()  {}

network/p2pNetwork.go

@@ -352,7 +352,7 @@ func (n *P2PNetwork) setup() error {
 	n.meshUpdateRequests = make(chan meshRequest, 5)
 	meshCreator := n.meshCreator
 	if meshCreator == nil {
-		meshCreator = &BaseMeshCreator{}
+		meshCreator = &baseMeshCreator{}
 	}
 	var err error
 	n.mesher, err = meshCreator.create(

network/wsNetwork.go

@@ -599,7 +599,7 @@ func (wn *WebsocketNetwork) setup() error {
 	wn.meshUpdateRequests = make(chan meshRequest, 5)
 	meshCreator := wn.meshCreator
 	if meshCreator == nil {
-		meshCreator = &BaseMeshCreator{}
+		meshCreator = &baseMeshCreator{}
 	}
 	var err error
 	wn.mesher, err = meshCreator.create(

node/node.go

@@ -212,7 +212,7 @@ func MakeFull(log logging.Logger, rootDir string, cfg config.Local, phonebookAdd
 	}
 recreateNetwork:
 	if cfg.EnableP2PHybridMode {
-		p2pNode, err = network.NewHybridP2PNetwork(node.log, node.config, rootDir, phonebookAddresses, genesisInfo, node, &network.HybridRelayMeshCreator{})
+		p2pNode, err = network.NewHybridP2PNetwork(node.log, node.config, rootDir, phonebookAddresses, genesisInfo, node, nil)
 		if err != nil {
 			if _, ok := err.(config.P2PHybridConfigError); !ok {
 				log.Errorf("could not create hybrid p2p node: %v", err)
@@ -232,14 +232,14 @@ recreateNetwork:
 			goto recreateNetwork
 		}
 	} else if cfg.EnableP2P {
-		p2pNode, err = network.NewP2PNetwork(node.log, node.config, rootDir, phonebookAddresses, genesisInfo, node, nil, &network.BaseMeshCreator{})
+		p2pNode, err = network.NewP2PNetwork(node.log, node.config, rootDir, phonebookAddresses, genesisInfo, node, nil, nil)
 		if err != nil {
 			log.Errorf("could not create p2p node: %v", err)
 			return nil, err
 		}
 	} else {
 		var wsNode *network.WebsocketNetwork
-		wsNode, err = network.NewWebsocketNetwork(node.log, node.config, phonebookAddresses, genesisInfo, node, nil, &network.BaseMeshCreator{})
+		wsNode, err = network.NewWebsocketNetwork(node.log, node.config, phonebookAddresses, genesisInfo, node, nil, nil)
 		if err != nil {
 			log.Errorf("could not create websocket node: %v", err)
 			return nil, err