Remove usage of timer.Timer in node

node/beacon_manager.go

@@ -4,32 +4,35 @@
 package node
 
 import (
+	"sync"
 	"sync/atomic"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/snow/networking/router"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/timer"
 	"github.com/ava-labs/avalanchego/version"
 )
 
 var _ router.Router = (*beaconManager)(nil)
 
 type beaconManager struct {
 	router.Router
-	timer         *timer.Timer
-	beacons       validators.Manager
-	requiredConns int64
-	numConns      int64
+	beacons                     validators.Manager
+	requiredConns               int64
+	numConns                    int64
+	onSufficientlyConnected     chan struct{}
+	onceOnSufficientlyConnected sync.Once
 }
 
 func (b *beaconManager) Connected(nodeID ids.NodeID, nodeVersion *version.Application, subnetID ids.ID) {
 	_, isBeacon := b.beacons.GetValidator(constants.PrimaryNetworkID, nodeID)
 	if isBeacon &&
 		constants.PrimaryNetworkID == subnetID &&
 		atomic.AddInt64(&b.numConns, 1) >= b.requiredConns {
-		b.timer.Cancel()
+		b.onceOnSufficientlyConnected.Do(func() {
+			close(b.onSufficientlyConnected)
+		})
 	}
 	b.Router.Connected(nodeID, nodeVersion, subnetID)
 }

node/beacon_manager_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ava-labs/avalanchego/snow/networking/router"
 	"github.com/ava-labs/avalanchego/snow/validators"
 	"github.com/ava-labs/avalanchego/utils/constants"
-	"github.com/ava-labs/avalanchego/utils/timer"
 	"github.com/ava-labs/avalanchego/version"
 )
 
@@ -41,10 +40,10 @@ func TestBeaconManager_DataRace(t *testing.T) {
 	mockRouter := router.NewMockRouter(ctrl)
 
 	b := beaconManager{
-		Router:        mockRouter,
-		timer:         timer.NewTimer(nil),
-		beacons:       validatorSet,
-		requiredConns: numValidators,
+		Router:                  mockRouter,
+		beacons:                 validatorSet,
+		requiredConns:           numValidators,
+		onSufficientlyConnected: make(chan struct{}),
 	}
 
 	// connect numValidators validators, each with a weight of 1

node/node.go

@@ -73,7 +73,6 @@ import (
 	"github.com/ava-labs/avalanchego/utils/profiler"
 	"github.com/ava-labs/avalanchego/utils/resource"
 	"github.com/ava-labs/avalanchego/utils/set"
-	"github.com/ava-labs/avalanchego/utils/timer"
 	"github.com/ava-labs/avalanchego/version"
 	"github.com/ava-labs/avalanchego/vms"
 	"github.com/ava-labs/avalanchego/vms/avm"
@@ -480,28 +479,32 @@ func (n *Node) initNetworking() error {
 	requiredConns := (3*numBootstrappers + 3) / 4
 
 	if requiredConns > 0 {
-		// Set a timer that will fire after a given timeout unless we connect
-		// to a sufficient portion of nodes. If the timeout fires, the node will
-		// shutdown.
-		timer := timer.NewTimer(func() {
-			// If the timeout fires and we're already shutting down, nothing to do.
-			if !n.shuttingDown.Get() {
+		onSufficientlyConnected := make(chan struct{})
+		consensusRouter = &beaconManager{
+			Router:                  consensusRouter,
+			beacons:                 n.bootstrappers,
+			requiredConns:           int64(requiredConns),
+			onSufficientlyConnected: onSufficientlyConnected,
+		}
+
+		// Log a warning if we aren't able to connect to a sufficient portion of
+		// nodes.
+		go func() {
+			timer := time.NewTimer(n.Config.BootstrapBeaconConnectionTimeout)
+			defer timer.Stop()
+
+			select {
+			case <-timer.C:
+				if n.shuttingDown.Get() {
+					return
+				}
 				n.Log.Warn("failed to connect to bootstrap nodes",
 					zap.Stringer("bootstrappers", n.bootstrappers),
 					zap.Duration("duration", n.Config.BootstrapBeaconConnectionTimeout),
 				)
+			case <-onSufficientlyConnected:
 			}
-		})
-
-		go timer.Dispatch()
-		timer.SetTimeoutIn(n.Config.BootstrapBeaconConnectionTimeout)
-
-		consensusRouter = &beaconManager{
-			Router:        consensusRouter,
-			timer:         timer,
-			beacons:       n.bootstrappers,
-			requiredConns: int64(requiredConns),
-		}
+		}()
 	}
 
 	// initialize gossip tracker