From ad5709292e39658ccf06dfaabaa479800cbcb985 Mon Sep 17 00:00:00 2001
From: Goran Rojovic <goran.rojovic@ethernal.tech>
Date: Thu, 2 Nov 2023 09:48:00 +0100
Subject: [PATCH] Comments fix

---
 consensus/polybft/mocks_test.go |  2 +-
 consensus/polybft/polybft.go    |  2 +-
 syncer/syncer.go                | 17 +++--------------
 syncer/types.go                 |  4 ++--
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/consensus/polybft/mocks_test.go b/consensus/polybft/mocks_test.go
index 3ca22f86ea..de1434ea51 100644
--- a/consensus/polybft/mocks_test.go
+++ b/consensus/polybft/mocks_test.go
@@ -395,7 +395,7 @@ func (tp *syncerMock) Sync(func(*types.FullBlock) bool) error {
 	return args.Error(0)
 }
 
-func (tp *syncerMock) IsSyncingWithPeer() bool {
+func (tp *syncerMock) IsSyncing() bool {
 	args := tp.Called()
 
 	return args.Bool(0)
diff --git a/consensus/polybft/polybft.go b/consensus/polybft/polybft.go
index 5496e7f8ec..f9a46b63f5 100644
--- a/consensus/polybft/polybft.go
+++ b/consensus/polybft/polybft.go
@@ -612,7 +612,7 @@ func (p *Polybft) startConsensusProtocol() {
 	// wait until he stops syncing
 	p.logger.Info("waiting to stop syncing so that we can try to join consensus if node is a validator")
 
-	for p.syncer.IsSyncingWithPeer() {
+	for p.syncer.IsSyncing() {
 	}
 
 	p.logger.Info("node synced up on start. Trying to join consensus if validator")
diff --git a/syncer/syncer.go b/syncer/syncer.go
index c00773471f..a7aa1ec922 100644
--- a/syncer/syncer.go
+++ b/syncer/syncer.go
@@ -3,7 +3,6 @@ package syncer
 import (
 	"errors"
 	"fmt"
-	"sync/atomic"
 	"time"
 
 	"github.com/0xPolygon/polygon-edge/helper/progress"
@@ -39,8 +38,6 @@ type syncer struct {
 
 	// Channel to notify Sync that a new status arrived
 	newStatusCh chan struct{}
-
-	isSyncing atomic.Bool
 }
 
 func NewSyncer(
@@ -222,9 +219,6 @@ func (s *syncer) bulkSyncWithPeer(peerID peer.ID, peerLatestBlock uint64,
 		return 0, false, err
 	}
 
-	s.setIsSyncing(true)
-	defer s.setIsSyncing(false)
-
 	// Create a blockchain subscription for the sync progression and start tracking
 	subscription := s.blockchain.SubscribeEvents()
 	s.syncProgression.StartProgression(localLatest+1, subscription)
@@ -278,14 +272,9 @@ func (s *syncer) bulkSyncWithPeer(peerID peer.ID, peerLatestBlock uint64,
 	}
 }
 
-// setIsSyncing updates the isSyncing field
-func (s *syncer) setIsSyncing(isSyncing bool) {
-	s.isSyncing.Store(isSyncing)
-}
-
-// IsSyncingWithPeer indicates if node is syncing with peer
-func (s *syncer) IsSyncingWithPeer() bool {
-	return s.isSyncing.Load()
+// IsSyncing indicates if node is syncing with peer
+func (s *syncer) IsSyncing() bool {
+	return s.GetSyncProgression() != nil
 }
 
 func updateMetrics(fullBlock *types.FullBlock) {
diff --git a/syncer/types.go b/syncer/types.go
index cba42c4b94..a6f3f7a4c0 100644
--- a/syncer/types.go
+++ b/syncer/types.go
@@ -70,8 +70,8 @@ type Syncer interface {
 	HasSyncPeer() bool
 	// Sync starts routine to sync blocks
 	Sync(func(*types.FullBlock) bool) error
-
-	IsSyncingWithPeer() bool
+	// Indicates if syncer is syncing with the best peer
+	IsSyncing() bool
 }
 
 type Progression interface {