cr fixes

Author: algorandskiy

network/hybridNetwork.go

@@ -51,13 +51,13 @@ func NewHybridP2PNetwork(log logging.Logger, cfg config.Local, datadir string, p
 
 	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
 		childNetMeshCreator = &noopMeshCreator{}
-		hybridMeshCreator = &hybridRelayMeshCreator{}
+		hybridMeshCreator = hybridRelayMeshCreator{}
 	}
 
 	p2pnet, err := NewP2PNetwork(log, p2pcfg, datadir, phonebookAddresses, genesisInfo, nodeInfo, &identityOpts{tracker: identityTracker}, childNetMeshCreator)

network/mesh.go

@@ -192,15 +192,15 @@ type MeshCreator interface {
 // run a mesh thread that periodically checks for new peers.
 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:
 // always use wsnet nodes
 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)

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(