RM some retries

consensus/polybft/polybft.go

@@ -2,7 +2,6 @@
 package polybft
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"path/filepath"
@@ -354,17 +353,14 @@ func (p *Polybft) Start() error {
 	}
 
 	// start syncing
-	go common.RetryForever(context.Background(), time.Second, func(context.Context) error {
-		blockHandler := func(b *types.FullBlock) bool {
-			p.runtime.OnBlockInserted(b)
-			return false
-		}
-		if err := p.syncer.Sync(blockHandler); err != nil {
-			p.logger.Error("blocks synchronization failed", "error", err)
-			return err
-		}
-		return nil
-	})
+	blockHandler := func(b *types.FullBlock) bool {
+		p.runtime.OnBlockInserted(b)
+		return false
+	}
+	if err := p.syncer.Sync(blockHandler); err != nil {
+		p.logger.Error("blocks synchronization failed", "error", err)
+		return err
+	}
 
 	// start consensus runtime
 	if err := p.startRuntime(); err != nil {

jsonrpc/jsonrpc.go

@@ -1,7 +1,6 @@
 package jsonrpc
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -10,7 +9,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/0xPolygon/polygon-edge/helper/common"
 	"github.com/0xPolygon/polygon-edge/versioning"
 	"github.com/gorilla/websocket"
 	"github.com/hashicorp/go-hclog"
@@ -128,13 +126,10 @@ func (j *JSONRPC) setupHTTP() error {
 		ReadHeaderTimeout: 60 * time.Second,
 	}
 
-	go common.RetryForever(context.Background(), time.Second, func(context.Context) error {
-		if err := srv.Serve(lis); err != nil {
-			j.logger.Error("closed http connection", "err", err)
-			return err
-		}
-		return nil
-	})
+	if err := srv.Serve(lis); err != nil {
+		j.logger.Error("closed http connection", "err", err)
+		return err
+	}
 
 	return nil
 }

tracker/event_tracker.go

@@ -80,6 +80,7 @@ func (e *EventTracker) Start(ctx context.Context) error {
 		return fmt.Errorf("failed to start blocktracker: %w", err)
 	}
 
+	// Run tracker
 	tt, err := tracker.NewTracker(provider.Eth(),
 		tracker.WithBatchSize(10),
 		tracker.WithBlockTracker(blockTracker),