clock cleanup

vms/platformvm/blocks/builder/helpers_test.go

@@ -323,9 +323,9 @@ func defaultConfig() *config.Config {
 
 func defaultClock() *mockable.Clock {
 	// set time after Banff fork (and before default nextStakerTime)
-	clk := mockable.Clock{}
+	clk := &mockable.Clock{}
 	clk.Set(defaultGenesisTime)
-	return &clk
+	return clk
 }
 
 type fxVMInt struct {

vms/platformvm/blocks/executor/helpers_test.go

@@ -354,9 +354,9 @@ func defaultConfig() *config.Config {
 }
 
 func defaultClock() *mockable.Clock {
-	clk := mockable.Clock{}
+	clk := &mockable.Clock{}
 	clk.Set(defaultGenesisTime)
-	return &clk
+	return clk
 }
 
 type fxVMInt struct {

vms/platformvm/txs/executor/helpers_test.go

@@ -123,19 +123,19 @@ func newEnvironment(postBanff, postCortina bool) *environment {
 	baseDB := versiondb.New(baseDBManager.Current().Database)
 	ctx, msm := defaultCtx(baseDB)
 
-	fx := defaultFx(&clk, ctx.Log, isBootstrapped.Get())
+	fx := defaultFx(clk, ctx.Log, isBootstrapped.Get())
 
 	rewards := reward.NewCalculator(config.RewardConfig)
 	baseState := defaultState(&config, ctx, baseDB, rewards)
 
 	atomicUTXOs := avax.NewAtomicUTXOManager(ctx.SharedMemory, txs.Codec)
 	uptimes := uptime.NewManager(baseState)
-	utxoHandler := utxo.NewHandler(ctx, &clk, fx)
+	utxoHandler := utxo.NewHandler(ctx, clk, fx)
 
 	txBuilder := builder.New(
 		ctx,
 		&config,
-		&clk,
+		clk,
 		fx,
 		baseState,
 		atomicUTXOs,
@@ -145,7 +145,7 @@ func newEnvironment(postBanff, postCortina bool) *environment {
 	backend := Backend{
 		Config:       &config,
 		Ctx:          ctx,
-		Clk:          &clk,
+		Clk:          clk,
 		Bootstrapped: &isBootstrapped,
 		Fx:           fx,
 		FlowChecker:  utxoHandler,
@@ -156,7 +156,7 @@ func newEnvironment(postBanff, postCortina bool) *environment {
 	env := &environment{
 		isBootstrapped: &isBootstrapped,
 		config:         &config,
-		clk:            &clk,
+		clk:            clk,
 		baseDB:         baseDB,
 		ctx:            ctx,
 		msm:            msm,
@@ -321,13 +321,13 @@ func defaultConfig(postBanff, postCortina bool) config.Config {
 	}
 }
 
-func defaultClock(postFork bool) mockable.Clock {
+func defaultClock(postFork bool) *mockable.Clock {
 	now := defaultGenesisTime
 	if postFork {
 		// 1 second after Banff fork
 		now = defaultValidateEndTime.Add(-2 * time.Second)
 	}
-	clk := mockable.Clock{}
+	clk := &mockable.Clock{}
 	clk.Set(now)
 	return clk
 }

vms/platformvm/validators/manager.go

@@ -55,17 +55,17 @@ func NewManager(
 	cfg config.Config,
 	state state.State,
 	metrics metrics.Metrics,
-	clk mockable.Clock,
+	clk *mockable.Clock,
 ) Manager {
 	return &manager{
 		cfg:     cfg,
 		state:   state,
 		metrics: metrics,
-		clk:     &clk,
+		clk:     clk,
 		caches:  make(map[ids.ID]cache.Cacher[uint64, map[ids.NodeID]*validators.GetValidatorOutput]),
 		recentlyAccepted: window.New[ids.ID](
 			window.Config{
-				Clock:   &clk,
+				Clock:   clk,
 				MaxSize: maxRecentlyAcceptedWindowSize,
 				TTL:     recentlyAcceptedWindowTTL,
 			},

vms/platformvm/validators/manager_test.go

@@ -384,7 +384,7 @@ func TestVM_GetValidatorSet(t *testing.T) {
 			metrics, err := metrics.New("", prometheus.NewRegistry(), cfg.TrackedSubnets)
 			r.NoError(err)
 
-			clk := mockable.Clock{}
+			clk := &mockable.Clock{}
 			validatorssSet := NewManager(cfg, mockState, metrics, clk)
 
 			// Mock the VM's validators

vms/platformvm/vm.go

@@ -139,7 +139,7 @@ func (vm *VM) Initialize(
 		return err
 	}
 
-	validatorsSet := pvalidators.NewManager(vm.Config, vm.state, vm.metrics, vm.clock)
+	validatorsSet := pvalidators.NewManager(vm.Config, vm.state, vm.metrics, &vm.clock)
 	vm.QueryManager = validatorsSet
 	vm.atomicUtxosManager = avax.NewAtomicUTXOManager(chainCtx.SharedMemory, txs.Codec)
 	utxoHandler := utxo.NewHandler(vm.ctx, &vm.clock, vm.fx)