refactor ticker

Author: paologalligit

cmd/network/main.go

@@ -54,7 +54,7 @@ func main() {
 		return
 	}
 	fmt.Println("\n🕐 Waiting for POS to become active... expected at block ", config.ForkBlock+config.TransitionPeriod)
-	if err := utils.WaitForPOS(t.Context(), staker, config.ForkBlock+config.TransitionPeriod); err != nil {
+	if err := utils.WaitForPOS(context.Background(), staker, config.ForkBlock+config.TransitionPeriod); err != nil {
 		fmt.Println("  - Error waiting for PoS:", err)
 		return
 	}

cmd/txsimulation/contract/contract_service.go

@@ -84,9 +84,9 @@ func (s *Service) poll() {
 				time.Sleep(5 * time.Second) // Retry after a short delay
 				continue
 			}
-			validators, err := s.FetchAll(block.(*api.JSONExpandedBlock).ID)
+			validators, err := s.FetchAll(block.ID)
 			if err != nil {
-				slog.Error("Failed to fetch validatorInfo", "error", err, "block", block.(*api.JSONExpandedBlock).ID)
+				slog.Error("Failed to fetch validatorInfo", "error", err, "block", block.ID)
 				continue
 			}
 

cmd/txsimulation/devnet.go

@@ -28,6 +28,7 @@ import (
 	"github.com/vechain/hayabusa-e2e/cmd/txsimulation/xnodes"
 	"github.com/vechain/hayabusa-e2e/hayabusa"
 	utils2 "github.com/vechain/hayabusa-e2e/utils"
+	"github.com/vechain/networkhub/utils/common"
 	protocolbuiltin "github.com/vechain/thor/v2/builtin"
 	genesisthor "github.com/vechain/thor/v2/genesis"
 	"github.com/vechain/thor/v2/thor"
@@ -211,7 +212,7 @@ func setStargate(ctx context.Context, client *thorclient.Client, executors []*bi
 	}
 
 	// wait for the receipts
-	ticker := utils2.NewTicker(client)
+	ticker := common.NewTicker(client)
 	approved := make(map[thor.Address]bool)
 	for range 6 {
 		if len(approved) >= len(executors) {

cmd/txsimulation/devnetcleanup/delegations.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/vechain/hayabusa-e2e/cmd/txsimulation/contract"
 	"github.com/vechain/hayabusa-e2e/cmd/txsimulation/stack"
-	"github.com/vechain/hayabusa-e2e/utils"
+	"github.com/vechain/networkhub/utils/common"
 	"github.com/vechain/thor/v2/api"
 	"github.com/vechain/thor/v2/thorclient/bind"
 )
@@ -87,14 +87,11 @@ func (c *Cleanup) exitDelegations(delegations []*big.Int, method exitMethod) {
 	var groups [][]*big.Int
 	groupSize := 100
 	for i := 0; i < len(delegations); i += groupSize {
-		end := i + groupSize
-		if end > len(delegations) {
-			end = len(delegations)
-		}
+		end := min(i+groupSize, len(delegations))
 		groups = append(groups, delegations[i:end])
 	}
 
-	ticker := utils.NewTicker(c.stack.Client())
+	ticker := common.NewTicker(c.stack.Client())
 
 	for _, ids := range groups {
 		slog.Info("processing cleanup", "first", ids[0], "last", ids[len(ids)-1], "count", len(ids))

cmd/txsimulation/lifecycle/engine.go

@@ -71,8 +71,8 @@ func (e *Engine) Run() {
 			}
 			_, id, _ := e.stack.Staker().FirstActive()
 			if !id.IsZero() {
-				e.generateValidatorCycles(best.(*api.JSONExpandedBlock))
-				e.generateDelegatorCycles(best.(*api.JSONExpandedBlock))
+				e.generateValidatorCycles(best)
+				e.generateDelegatorCycles(best)
 			}
 			delegationStatus := make(map[Status]int)
 			validationStatus := make(map[Status]int)
@@ -87,7 +87,7 @@ func (e *Engine) Run() {
 				}
 				if lifecycle.Status() != StatusWithdrawn {
 					e.workerPool.Run(func() {
-						if err := lifecycle.Process(best.(*api.JSONExpandedBlock).Number); err != nil {
+						if err := lifecycle.Process(best.Number); err != nil {
 							slog.Error("failed to process lifecycle", "type", lifecycle.Type(), "id", lifecycle.ID(), "error", err)
 						}
 					})
@@ -139,11 +139,11 @@ func (e *Engine) Flush(status Status) error {
 		for _, lifecycle := range e.lifecycles {
 			e.workerPool.Run(func(l Lifecycle, current *api.JSONExpandedBlock) Worker {
 				return func() {
-					if err := lifecycle.Process(best.(*api.JSONExpandedBlock).Number); err != nil {
+					if err := lifecycle.Process(best.Number); err != nil {
 						slog.Error("failed to process lifecycle", "type", lifecycle.Type(), "id", lifecycle.ID(), "error", err)
 					}
 				}
-			}(lifecycle, best.(*api.JSONExpandedBlock)))
+			}(lifecycle, best))
 		}
 
 		processed = true