fix: lint

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>

go/internal/initutil/ipfs.go

@@ -678,16 +678,6 @@ func (m *Manager) configIPFSRouting(h host.Host, r p2p_routing.Routing) error {
 		discovery.FullJitter,
 		time.Second, 10.0, 0, serverRng)
 
-	// tinderOpts := &tinder.Opts{
-	// 	Logger:                 logger,
-	// 	AdvertiseResetInterval: time.Hour,
-	// 	FindPeerResetInterval:  time.Minute * 10,
-	// 	AdvertiseGracePeriod:   time.Minute,
-	// 	BackoffStrategy: &tinder.BackoffOpts{
-	// 		StratFactory: backoffstrat,
-	// 	},
-	// }
-
 	m.Node.Protocol.tinder, err = tinder.NewService(h, logger, drivers...)
 	if err != nil {
 		return errcode.ErrIPFSSetupHost.Wrap(err)

go/internal/ipfsutil/testing.go

@@ -142,18 +142,6 @@ func TestingCoreAPIUsingMockNet(ctx context.Context, t testing.TB, opts *Testing
 			drivers = append(drivers, driver)
 		}
 
-		// minBackoff, maxBackoff := time.Second, time.Minute
-		// rng := rand.New(rand.NewSource(rand.Int63()))
-		// tinderOpts := &tinder.Opts{
-		// 	Logger:                 opts.Logger,
-		// 	AdvertiseResetInterval: time.Minute,
-		// 	AdvertiseGracePeriod:   time.Minute,
-		// 	BackoffStrategy: &tinder.BackoffOpts{
-		// 		StratFactory: discovery.NewFixedBackoff(time.Second),
-		// 	},
-		// BackoffStratFactory: discovery.NewExponentialBackoff(minBackoff, maxBackoff, discovery.FullJitter, time.Second, 5.0, 0, rng),
-		// }
-
 		// enable discovery monitor
 		stinder, err = tinder.NewService(h, opts.Logger, drivers...)
 		if err != nil {

go/internal/rendezvous/emitterio_sync_client.go

@@ -36,7 +36,6 @@ type emitterClientManager struct {
 	inChan   chan *registrationMessage
 	mu       sync.Mutex
 	logger   *zap.Logger
-	wg       sync.WaitGroup
 }
 
 func (e *emitterClient) subscribeToServerUpdates(inChan chan *registrationMessage, psDetails *EmitterPubSubSubscriptionDetails) (err error) {

go/internal/tinder/driver_localdiscovery.go

@@ -168,7 +168,8 @@ func (ld *LocalDiscovery) FindPeers(ctx context.Context, cid string, opts ...dis
 
 		for _, rec := range cache.recs {
 			out <- *rec.peer
-			if size = size - 1; size == 0 {
+			size--
+			if size == 0 {
 				break
 			}
 		}

go/internal/tinder/driver_mock.go

@@ -108,7 +108,6 @@ func (s *MockDriverServer) Subscribe(ctx context.Context, topic string, buffsize
 			for _, peer := range s.pc.GetPeers(updated...) {
 				out <- peer
 			}
-
 		}
 
 		// we're done here, close the channel and decrement
@@ -214,7 +213,7 @@ const (
 	optionSubscribeBufferSize discOption = "tinder_subsize"
 )
 
-func mockBufferSize(size int) discovery.Option {
+func MockBufferSize(size int) discovery.Option {
 	return func(opts *discovery.Options) error {
 		if opts.Other == nil {
 			opts.Other = make(map[interface{}]interface{})

go/internal/tinder/service.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"sync"
 	"sync/atomic"
-	"time"
 
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"go.uber.org/zap"
+
+	"berty.tech/berty/v2/go/internal/logutil"
 )
 
 type Service struct {
@@ -26,10 +27,6 @@ type Service struct {
 	process    uint32
 }
 
-type RegisterOption struct {
-	gracePeriode time.Duration
-}
-
 func NewService(h host.Host, logger *zap.Logger, drivers ...IDriver) (*Service, error) {
 	nn, err := NewNetworkUpdate(logger, h)
 	if err != nil {
@@ -52,7 +49,9 @@ func (s *Service) FindPeers(ctx context.Context, topic string) <-chan peer.AddrI
 
 	ctx, cancel := context.WithCancel(ctx)
 	go func() {
-		s.LookupPeers(ctx, topic)
+		if err := s.LookupPeers(ctx, topic); err != nil {
+			s.logger.Error("lookup failed", logutil.PrivateString("topic", topic), zap.Error(err))
+		}
 		cancel()
 	}()
 

go/internal/tinder/service_adaptater.go

@@ -137,12 +137,20 @@ func (a *DiscoveryAdaptater) Advertise(_ context.Context, topic string, opts ...
 			a.muAdvertiser.Unlock()
 
 			// unregister from this topic if possible
-			a.service.UnRegister(ctx, topic)
+			if err := a.service.UnRegister(ctx, topic); err != nil {
+				a.logger.Debug("unregister failed",
+					logutil.PrivateString("topic", topic),
+					zap.Error(err),
+				)
+			}
 		})
 
 		// start advertising on this topic
-		a.service.Advertises(wctx, topic, AdvertisesFilterDrivers(LocalDiscoveryName))
-		a.logger.Debug("advertise started", logutil.PrivateString("topic", topic))
+		if err := a.service.Advertises(wctx, topic, AdvertisesFilterDrivers(LocalDiscoveryName)); err != nil {
+			a.logger.Error("advertise failed", logutil.PrivateString("topic", topic), zap.Error(err))
+		} else {
+			a.logger.Debug("advertise started", logutil.PrivateString("topic", topic))
+		}
 	}
 
 	a.muAdvertiser.Unlock()

go/internal/tinder/service_advertises.go

@@ -50,12 +50,12 @@ func (s *Service) Advertises(ctx context.Context, topic string, opts ...Advertis
 	}
 	// @TODO(gfanton): add filter
 	for _, driver := range s.drivers {
-		// if aopts.Filters != nil {
-		// 	// skip filter driver
-		// 	if _, filter := aopts.Filters[driver.Name()]; filter {
-		// 		continue
-		// 	}
-		// }
+		if aopts.Filters != nil {
+			// skip filter driver
+			if _, filter := aopts.Filters[driver.Name()]; filter {
+				continue
+			}
+		}
 
 		go func(driver IDriver) {
 			if err := s.advertise(ctx, driver, topic); err != nil {
@@ -120,22 +120,3 @@ func (s *Service) advertise(ctx context.Context, d IDriver, topic string) error
 		}
 	}
 }
-
-// func (s *Service) advertises(ctx context.Context, topic string, opts ...p2p_discovery.Option) {
-
-// 	// var filters []string
-// 	// if f, ok := optiotopic.Other[optionFilterDriver]; ok {
-// 	// 	if filters, ok = f.([]string); !ok {
-// 	// 		s.logger.Error("unable to parse filter driver option")
-// 	// 		return
-// 	// 	}
-// 	// }
-
-// 	for _, d := range s.drivers {
-// 		// if shoudlFilterDriver(d.Name, filters) {
-// 		// 	continue
-// 		// }
-
-// 		go s.advertise(ctx, d, topic, opts...)
-// 	}
-// }

go/internal/tinder/service_subscription.go

@@ -70,7 +70,6 @@ func (s *Service) LookupPeers(ctx context.Context, topic string) error {
 
 			wg.Done()
 		}(d)
-
 	}
 
 	wg.Wait() // wait for process to finish

go/pkg/bertyprotocol/tinder_swiper.go

@@ -167,7 +167,7 @@ func (s *Swiper) WatchTopic(ctx context.Context, topic, seed []byte) <-chan peer
 	return cpeers
 }
 
-func (s *Swiper) watchPeers(ctx context.Context, bstrat discovery.BackoffStrategy, out chan<- peer.AddrInfo, topic string) error {
+func (s *Swiper) watchPeers(ctx context.Context, _ discovery.BackoffStrategy, out chan<- peer.AddrInfo, topic string) error {
 	sub := s.tinder.Subscribe(topic)
 	defer sub.Close()
 	// func () {
@@ -190,7 +190,6 @@ func (s *Swiper) watchPeers(ctx context.Context, bstrat discovery.BackoffStrateg
 			select {
 			case <-time.After(timeout):
 			case <-ctx.Done():
-
 			}
 		}
 	}()
@@ -224,7 +223,11 @@ func (s *Swiper) Announce(ctx context.Context, topic, seed []byte) {
 			s.logger.Debug("self announce topic for time", logutil.PrivateString("topic", point.RotationTopic()))
 
 			actx, cancel := context.WithDeadline(ctx, point.Deadline())
-			s.tinder.Advertises(actx, point.RotationTopic())
+			if err := s.tinder.Advertises(actx, point.RotationTopic()); err != nil && err != ctx.Err() {
+				cancel()
+				<-time.After(time.Second * 10) // retry after 10sc
+				continue
+			}
 
 			select {
 			case <-actx.Done():