From f4013665b1f319b63ca49a3b9270361760e9fb2c Mon Sep 17 00:00:00 2001
From: frank <lovefree103@gmail.com>
Date: Mon, 4 Mar 2024 17:21:20 +0800
Subject: [PATCH] use config instead of setting in filter_manager.go

---
 wakuv2/filter_manager.go | 14 +++++++-------
 wakuv2/waku_test.go      |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wakuv2/filter_manager.go b/wakuv2/filter_manager.go
index ff6f9b2cd..eb661d841 100644
--- a/wakuv2/filter_manager.go
+++ b/wakuv2/filter_manager.go
@@ -60,11 +60,11 @@ type FilterManager struct {
 	getFilter        func(string) *common.Filter
 	onNewEnvelopes   func(env *protocol.Envelope) error
 	logger           *zap.Logger
-	settings         settings
+	config           *Config
 	node             *node.WakuNode
 }
 
-func newFilterManager(ctx context.Context, logger *zap.Logger, getFilterFn func(string) *common.Filter, settings settings, onNewEnvelopes func(env *protocol.Envelope) error, node *node.WakuNode) *FilterManager {
+func newFilterManager(ctx context.Context, logger *zap.Logger, getFilterFn func(string) *common.Filter, config *Config, onNewEnvelopes func(env *protocol.Envelope) error, node *node.WakuNode) *FilterManager {
 	// This fn is being mocked in test
 	mgr := new(FilterManager)
 	mgr.ctx = ctx
@@ -73,7 +73,7 @@ func newFilterManager(ctx context.Context, logger *zap.Logger, getFilterFn func(
 	mgr.onNewEnvelopes = onNewEnvelopes
 	mgr.filterSubs = make(FilterSubs)
 	mgr.eventChan = make(chan FilterEvent, 100)
-	mgr.settings = settings
+	mgr.config = config
 	mgr.node = node
 	mgr.isFilterSubAlive = func(sub *subscription.SubscriptionDetails) error {
 		ctx, cancel := context.WithTimeout(ctx, pingTimeout)
@@ -242,7 +242,7 @@ func (mgr *FilterManager) pingPeers() {
 			}
 		}
 		logger.Debug("filter ping peers", zap.Int("len", len(subs)), zap.Int("len(nilSubs)", nilSubsCnt))
-		if len(subs) < mgr.settings.MinPeersForFilter {
+		if len(subs) < mgr.config.MinPeersForFilter {
 			// Trigger full resubscribe
 			logger.Debug("filter ping peers not enough subs")
 			go func(filterID string) {
@@ -290,15 +290,15 @@ func (mgr *FilterManager) resubscribe(filterID string) {
 		mgr.logger.Error("resubscribe filter not found", zap.String("filterId", filterID))
 		return
 	}
-	if len(subs) > mgr.settings.MinPeersForFilter {
+	if len(subs) > mgr.config.MinPeersForFilter {
 		mgr.logger.Error("filter resubscribe too many subs", zap.String("filterId", filterID), zap.Int("len", len(subs)))
 	}
-	if len(subs) == mgr.settings.MinPeersForFilter {
+	if len(subs) == mgr.config.MinPeersForFilter {
 		// do nothing
 		return
 	}
 	mgr.logger.Debug("filter resubscribe subs count:", zap.String("filterId", filterID), zap.Int("len", len(subs)))
-	for i := len(subs); i < mgr.settings.MinPeersForFilter; i++ {
+	for i := len(subs); i < mgr.config.MinPeersForFilter; i++ {
 		mgr.logger.Debug("filter check not passed, try subscribing to peers", zap.String("filterId", filterID))
 
 		// Create sub placeholder in order to avoid potentially too many subs
diff --git a/wakuv2/waku_test.go b/wakuv2/waku_test.go
index 00f4f5a83..b3344969c 100644
--- a/wakuv2/waku_test.go
+++ b/wakuv2/waku_test.go
@@ -352,7 +352,7 @@ func TestWakuV2Filter(t *testing.T) {
 
 	// Mock peers going down
 	isFilterSubAliveBak := w.filterManager.isFilterSubAlive
-	w.filterManager.settings.MinPeersForFilter = 0
+	w.filterManager.config.MinPeersForFilter = 0
 	w.filterManager.isFilterSubAlive = func(sub *subscription.SubscriptionDetails) error {
 		return errors.New("peer down")
 	}
@@ -365,7 +365,7 @@ func TestWakuV2Filter(t *testing.T) {
 	require.Len(t, stats[filterID], 0)
 
 	// Reconnect
-	w.filterManager.settings.MinPeersForFilter = 2
+	w.filterManager.config.MinPeersForFilter = 2
 	w.filterManager.isFilterSubAlive = isFilterSubAliveBak
 	time.Sleep(10 * time.Second)