Use set.Of rather than set.Add

genesis/genesis.go

@@ -341,8 +341,7 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
 		return nil, ids.ID{}, fmt.Errorf("couldn't calculate the initial supply: %w", err)
 	}
 
-	initiallyStaked := set.Set[ids.ShortID]{}
-	initiallyStaked.Add(config.InitialStakedFunds...)
+	initiallyStaked := set.Of(config.InitialStakedFunds...)
 	skippedAllocations := []Allocation(nil)
 
 	// Specify the initial state of the Platform Chain

message/ops.go

@@ -185,19 +185,19 @@ var (
 		AppRequestFailedOp:              AppResponseOp,
 		CrossChainAppRequestFailedOp:    CrossChainAppResponseOp,
 	}
-	UnrequestedOps = set.Set[Op]{
-		GetAcceptedFrontierOp:     {},
-		GetAcceptedOp:             {},
-		GetAncestorsOp:            {},
-		GetOp:                     {},
-		PushQueryOp:               {},
-		PullQueryOp:               {},
-		AppRequestOp:              {},
-		AppGossipOp:               {},
-		CrossChainAppRequestOp:    {},
-		GetStateSummaryFrontierOp: {},
-		GetAcceptedStateSummaryOp: {},
-	}
+	UnrequestedOps = set.Of(
+		GetAcceptedFrontierOp,
+		GetAcceptedOp,
+		GetAncestorsOp,
+		GetOp,
+		PushQueryOp,
+		PullQueryOp,
+		AppRequestOp,
+		AppGossipOp,
+		CrossChainAppRequestOp,
+		GetStateSummaryFrontierOp,
+		GetAcceptedStateSummaryOp,
+	)
 
 	errUnknownMessageType = errors.New("unknown message type")
 )

network/network_test.go

@@ -337,8 +337,7 @@ func TestSend(t *testing.T) {
 	outboundGetMsg, err := mc.Get(ids.Empty, 1, time.Second, ids.Empty, p2p.EngineType_ENGINE_TYPE_SNOWMAN)
 	require.NoError(err)
 
-	toSend := set.Set[ids.NodeID]{}
-	toSend.Add(nodeIDs[1])
+	toSend := set.Of(nodeIDs[1])
 	sentTo := net0.Send(outboundGetMsg, toSend, constants.PrimaryNetworkID, subnets.NoOpAllower)
 	require.Equal(toSend, sentTo)
 

node/node.go

@@ -767,8 +767,7 @@ func (n *Node) initChainManager(avaxAssetID ids.ID) error {
 	cChainID := createEVMTx.ID()
 
 	// If any of these chains die, the node shuts down
-	criticalChains := set.Set[ids.ID]{}
-	criticalChains.Add(
+	criticalChains := set.Of(
 		constants.PlatformChainID,
 		xChainID,
 		cChainID,

snow/engine/avalanche/getter/getter.go

@@ -110,8 +110,7 @@ func (gh *getter) GetAncestors(ctx context.Context, nodeID ids.NodeID, requestID
 	queue[0] = vertex
 	ancestorsBytesLen := 0                                                 // length, in bytes, of vertex and its ancestors
 	ancestorsBytes := make([][]byte, 0, gh.cfg.AncestorsMaxContainersSent) // vertex and its ancestors in BFS order
-	visited := set.Set[ids.ID]{}                                           // IDs of vertices that have been in queue before
-	visited.Add(vertex.ID())
+	visited := set.Of(vertex.ID())                                         // IDs of vertices that have been in queue before
 
 	for len(ancestorsBytes) < gh.cfg.AncestorsMaxContainersSent && len(queue) > 0 && time.Since(startTime) < gh.cfg.MaxTimeGetAncestors {
 		var vtx avalanche.Vertex

snow/engine/avalanche/getter/getter_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex"
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils/set"
 )
 
 var errUnknownVertex = errors.New("unknown vertex")
@@ -132,12 +131,7 @@ func TestFilterAccepted(t *testing.T) {
 
 	require.NoError(bs.GetAccepted(context.Background(), ids.EmptyNodeID, 0, vtxIDs))
 
-	acceptedSet := set.Set[ids.ID]{}
-	acceptedSet.Add(accepted...)
-
-	manager.GetVtxF = nil
-
-	require.Contains(acceptedSet, vtxID0)
-	require.Contains(acceptedSet, vtxID1)
-	require.NotContains(acceptedSet, vtxID2)
+	require.Contains(accepted, vtxID0)
+	require.Contains(accepted, vtxID1)
+	require.NotContains(accepted, vtxID2)
 }

snow/engine/common/queue/jobs_test.go

@@ -279,8 +279,7 @@ func TestMissingJobs(t *testing.T) {
 	numMissingIDs := jobs.NumMissingIDs()
 	require.Equal(2, numMissingIDs)
 
-	missingIDSet := set.Set[ids.ID]{}
-	missingIDSet.Add(jobs.MissingIDs()...)
+	missingIDSet := set.Of(jobs.MissingIDs()...)
 
 	containsJob0ID := missingIDSet.Contains(job0ID)
 	require.True(containsJob0ID)
@@ -296,8 +295,7 @@ func TestMissingJobs(t *testing.T) {
 	require.NoError(err)
 	require.NoError(jobs.SetParser(context.Background(), parser))
 
-	missingIDSet = set.Set[ids.ID]{}
-	missingIDSet.Add(jobs.MissingIDs()...)
+	missingIDSet = set.Of(jobs.MissingIDs()...)
 
 	containsJob0ID = missingIDSet.Contains(job0ID)
 	require.True(containsJob0ID)

snow/engine/snowman/getter/getter_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
 	"github.com/ava-labs/avalanchego/snow/engine/snowman/block/mocks"
 	"github.com/ava-labs/avalanchego/snow/validators"
-	"github.com/ava-labs/avalanchego/utils/set"
 )
 
 var errUnknownBlock = errors.New("unknown block")
@@ -172,11 +171,8 @@ func TestFilterAccepted(t *testing.T) {
 
 	require.NoError(bs.GetAccepted(context.Background(), ids.EmptyNodeID, 0, blkIDs))
 
-	acceptedSet := set.Set[ids.ID]{}
-	acceptedSet.Add(accepted...)
-
-	require.Len(acceptedSet, 2)
-	require.Contains(acceptedSet, blkID0)
-	require.Contains(acceptedSet, blkID1)
-	require.NotContains(acceptedSet, blkID2)
+	require.Len(accepted, 2)
+	require.Contains(accepted, blkID0)
+	require.Contains(accepted, blkID1)
+	require.NotContains(accepted, blkID2)
 }

snow/engine/snowman/transitive_test.go

@@ -231,8 +231,7 @@ func TestEngineQuery(t *testing.T) {
 		require.False(*queried)
 		*queried = true
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk.ID(), blockID)
 		require.Equal(uint64(1), requestedHeight)
@@ -282,8 +281,7 @@ func TestEngineQuery(t *testing.T) {
 		require.False(*queried)
 		*queried = true
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk1.ID(), blockID)
 		require.Equal(uint64(1), requestedHeight)
@@ -393,8 +391,7 @@ func TestEngineMultipleQuery(t *testing.T) {
 		require.False(*queried)
 		*queried = true
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr0, vdr1, vdr2)
+		vdrSet := set.Of(vdr0, vdr1, vdr2)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk0.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -467,8 +464,7 @@ func TestEngineMultipleQuery(t *testing.T) {
 		require.False(*queried)
 		*queried = true
 		*secondQueryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr0, vdr1, vdr2)
+		vdrSet := set.Of(vdr0, vdr1, vdr2)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk1.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -637,8 +633,7 @@ func TestEnginePushQuery(t *testing.T) {
 	sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, blkID ids.ID, requestedHeight uint64) {
 		require.False(*queried)
 		*queried = true
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.True(inVdrs.Equals(vdrSet))
 		require.Equal(blk.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -684,8 +679,7 @@ func TestEngineBuildBlock(t *testing.T) {
 	sender.SendPushQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, _ []byte, _ uint64) {
 		require.False(*pushSent)
 		*pushSent = true
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 	}
 
@@ -707,8 +701,7 @@ func TestEngineRepoll(t *testing.T) {
 	sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, _ ids.ID, _ uint64) {
 		require.False(*queried)
 		*queried = true
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 	}
 
@@ -792,8 +785,7 @@ func TestVoteCanceling(t *testing.T) {
 		require.False(*queried)
 		*queried = true
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr0, vdr1, vdr2)
+		vdrSet := set.Of(vdr0, vdr1, vdr2)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk.Bytes(), blkBytes)
 		require.Equal(uint64(1), requestedHeight)
@@ -1170,8 +1162,7 @@ func TestEngineBlockingChitResponse(t *testing.T) {
 	queryRequestID := new(uint32)
 	sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], requestID uint32, blkID ids.ID, requestedHeight uint64) {
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(issuedBlk.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -1664,8 +1655,7 @@ func TestEngineDoubleChit(t *testing.T) {
 		require.False((*queried))
 		*queried = true
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr0, vdr1)
+		vdrSet := set.Of(vdr0, vdr1)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -1771,8 +1761,7 @@ func TestEngineBuildBlockLimit(t *testing.T) {
 		reqID = rID
 		require.False(queried)
 		queried = true
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 	}
 
@@ -2272,8 +2261,7 @@ func TestEngineBubbleVotesThroughInvalidBlock(t *testing.T) {
 	require := require.New(t)
 
 	vdr, _, sender, vm, te, gBlk := setupDefaultConfig(t)
-	expectedVdrSet := set.Set[ids.NodeID]{}
-	expectedVdrSet.Add(vdr)
+	expectedVdrSet := set.Of(vdr)
 
 	// [blk1] is a child of [gBlk] and currently passes verification
 	blk1 := &snowman.TestBlock{
@@ -2347,8 +2335,7 @@ func TestEngineBubbleVotesThroughInvalidBlock(t *testing.T) {
 		*queried = true
 
 		*queryRequestID = requestID
-		vdrSet := set.Set[ids.NodeID]{}
-		vdrSet.Add(vdr)
+		vdrSet := set.Of(vdr)
 		require.Equal(vdrSet, inVdrs)
 		require.Equal(blk1.ID(), blkID)
 		require.Equal(uint64(1), requestedHeight)
@@ -2446,8 +2433,7 @@ func TestEngineBubbleVotesThroughInvalidChain(t *testing.T) {
 	require := require.New(t)
 
 	vdr, _, sender, vm, te, gBlk := setupDefaultConfig(t)
-	expectedVdrSet := set.Set[ids.NodeID]{}
-	expectedVdrSet.Add(vdr)
+	expectedVdrSet := set.Of(vdr)
 
 	// [blk1] is a child of [gBlk] and currently passes verification
 	blk1 := &snowman.TestBlock{

snow/event/blocker_test.go

@@ -28,8 +28,7 @@ func TestBlocker(t *testing.T) {
 	a.dependencies = func() set.Set[ids.ID] {
 		*calledDep = true
 
-		s := set.Set[ids.ID]{}
-		s.Add(id0, id1)
+		s := set.Of(id0, id1)
 		return s
 	}
 	calledFill := new(bool)

snow/networking/router/chain_router_test.go

@@ -1415,8 +1415,7 @@ func TestConnectedSubnet(t *testing.T) {
 	peerNodeID := ids.GenerateTestNodeID()
 	subnetID0 := ids.GenerateTestID()
 	subnetID1 := ids.GenerateTestID()
-	trackedSubnets := set.Set[ids.ID]{}
-	trackedSubnets.Add(subnetID0, subnetID1)
+	trackedSubnets := set.Of(subnetID0, subnetID1)
 	chainRouter := ChainRouter{}
 	require.NoError(chainRouter.Initialize(
 		myNodeID,

snow/networking/sender/sender_test.go

@@ -444,8 +444,7 @@ func TestReliableMessages(t *testing.T) {
 
 	go func() {
 		for i := 0; i < queriesToSend; i++ {
-			vdrIDs := set.Set[ids.NodeID]{}
-			vdrIDs.Add(ids.NodeID{1})
+			vdrIDs := set.Of(ids.NodeID{1})
 
 			sender.SendPullQuery(context.Background(), vdrIDs, uint32(i), ids.Empty, 0)
 			time.Sleep(time.Duration(rand.Float64() * float64(time.Microsecond))) // #nosec G404
@@ -596,8 +595,7 @@ func TestReliableMessagesToMyself(t *testing.T) {
 			// Send a pull query to some random peer that won't respond
 			// because they don't exist. This will almost immediately trigger
 			// a query failed message
-			vdrIDs := set.Set[ids.NodeID]{}
-			vdrIDs.Add(ids.GenerateTestNodeID())
+			vdrIDs := set.Of(ids.GenerateTestNodeID())
 			sender.SendPullQuery(context.Background(), vdrIDs, uint32(i), ids.Empty, 0)
 		}
 	}()

snow/validators/set_test.go

@@ -101,9 +101,7 @@ func TestSetSubsetWeight(t *testing.T) {
 	weight1 := uint64(123)
 	weight2 := uint64(810)
 
-	subset := set.Set[ids.NodeID]{}
-	subset.Add(nodeID0)
-	subset.Add(nodeID1)
+	subset := set.Of(nodeID0, nodeID1)
 
 	s := NewSet()
 

vms/avm/vm_benchmark_test.go

@@ -97,8 +97,7 @@ func GetAllUTXOsBenchmark(b *testing.B, utxoCount int) {
 	}
 	require.NoError(env.vm.state.Commit())
 
-	addrsSet := set.Set[ids.ShortID]{}
-	addrsSet.Add(addr)
+	addrsSet := set.Of(addr)
 
 	b.ResetTimer()
 

vms/components/avax/utxo_fetching_test.go

@@ -22,8 +22,7 @@ func TestFetchUTXOs(t *testing.T) {
 	txID := ids.GenerateTestID()
 	assetID := ids.GenerateTestID()
 	addr := ids.GenerateTestShortID()
-	addrs := set.Set[ids.ShortID]{}
-	addrs.Add(addr)
+	addrs := set.Of(addr)
 	utxo := &UTXO{
 		UTXOID: UTXOID{
 			TxID:        txID,
@@ -71,8 +70,7 @@ func TestGetPaginatedUTXOs(t *testing.T) {
 	addr0 := ids.GenerateTestShortID()
 	addr1 := ids.GenerateTestShortID()
 	addr2 := ids.GenerateTestShortID()
-	addrs := set.Set[ids.ShortID]{}
-	addrs.Add(addr0, addr1)
+	addrs := set.Of(addr0, addr1)
 
 	c := linearcodec.NewDefault()
 	manager := codec.NewDefaultManager()