enable subscription filter except ghost node

onflow · Sep 27, 2021 · f6ed91b · f6ed91b
1 parent 2ba7bcb
commit f6ed91b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmd/scaffold.go b/cmd/scaffold.go
@@ -184,7 +184,8 @@ func (fnb *FlowNodeBuilder) EnqueueNetworkInit(ctx context.Context) {
 			p2p.DefaultMaxPubSubMsgSize,
 			fnb.Metrics.Network,
 			pingProvider,
-			fnb.BaseConfig.DNSCacheTTL)
+			fnb.BaseConfig.DNSCacheTTL,
+			fnb.BaseConfig.NodeRole)
 
 		if err != nil {
 			return nil, fmt.Errorf("could not generate libp2p node factory: %w", err)

diff --git a/network/p2p/libp2pNode.go b/network/p2p/libp2pNode.go
@@ -72,7 +72,8 @@ func DefaultLibP2PNodeFactory(ctx context.Context,
 	maxPubSubMsgSize int,
 	metrics module.NetworkMetrics,
 	pingInfoProvider PingInfoProvider,
-	dnsResolverTTL time.Duration) (LibP2PFactoryFunc, error) {
+	dnsResolverTTL time.Duration,
+	role string) (LibP2PFactoryFunc, error) {
 
 	connManager := NewConnManager(log, metrics)
 
@@ -82,7 +83,7 @@ func DefaultLibP2PNodeFactory(ctx context.Context,
 
 	psOpts := DefaultPubsubOptions(maxPubSubMsgSize)
 
-	if chainID != flow.Localnet {
+	if role != "ghost" {
 		psOpts = append(psOpts, func(_ context.Context, h host.Host) (pubsub.Option, error) {
 			return pubsub.WithSubscriptionFilter(NewRoleBasedFilter(
 				h.ID(), rootBlockID, idProvider,