Skip to content

Commit 8d2c4f2

Browse files
StephenButtolphStephenButtolph
authored
Use set.Of rather than set.Add (#2164)
1 parent 9da2e62 commit 8d2c4f2

File tree

19 files changed

+59
-110
lines changed

19 files changed

+59
-110
lines changed

‎genesis/genesis.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ func FromConfig(config *Config) ([]byte, ids.ID, error) {
341341
return nil, ids.ID{}, fmt.Errorf("couldn't calculate the initial supply: %w", err)
342342
}
343343

344-
initiallyStaked := set.Set[ids.ShortID]{}
345-
initiallyStaked.Add(config.InitialStakedFunds...)
344+
initiallyStaked := set.Of(config.InitialStakedFunds...)
346345
skippedAllocations := []Allocation(nil)
347346

348347
// Specify the initial state of the Platform Chain

‎message/ops.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -185,19 +185,19 @@ var (
185185
AppRequestFailedOp: AppResponseOp,
186186
CrossChainAppRequestFailedOp: CrossChainAppResponseOp,
187187
}
188-
UnrequestedOps = set.Set[Op]{
189-
GetAcceptedFrontierOp: {},
190-
GetAcceptedOp: {},
191-
GetAncestorsOp: {},
192-
GetOp: {},
193-
PushQueryOp: {},
194-
PullQueryOp: {},
195-
AppRequestOp: {},
196-
AppGossipOp: {},
197-
CrossChainAppRequestOp: {},
198-
GetStateSummaryFrontierOp: {},
199-
GetAcceptedStateSummaryOp: {},
200-
}
188+
UnrequestedOps = set.Of(
189+
GetAcceptedFrontierOp,
190+
GetAcceptedOp,
191+
GetAncestorsOp,
192+
GetOp,
193+
PushQueryOp,
194+
PullQueryOp,
195+
AppRequestOp,
196+
AppGossipOp,
197+
CrossChainAppRequestOp,
198+
GetStateSummaryFrontierOp,
199+
GetAcceptedStateSummaryOp,
200+
)
201201

202202
errUnknownMessageType = errors.New("unknown message type")
203203
)

‎network/network_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,7 @@ func TestSend(t *testing.T) {
337337
outboundGetMsg, err := mc.Get(ids.Empty, 1, time.Second, ids.Empty, p2p.EngineType_ENGINE_TYPE_SNOWMAN)
338338
require.NoError(err)
339339

340-
toSend := set.Set[ids.NodeID]{}
341-
toSend.Add(nodeIDs[1])
340+
toSend := set.Of(nodeIDs[1])
342341
sentTo := net0.Send(outboundGetMsg, toSend, constants.PrimaryNetworkID, subnets.NoOpAllower)
343342
require.Equal(toSend, sentTo)
344343

‎node/node.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,8 +762,7 @@ func (n *Node) initChainManager(avaxAssetID ids.ID) error {
762762
cChainID := createEVMTx.ID()
763763

764764
// If any of these chains die, the node shuts down
765-
criticalChains := set.Set[ids.ID]{}
766-
criticalChains.Add(
765+
criticalChains := set.Of(
767766
constants.PlatformChainID,
768767
xChainID,
769768
cChainID,

‎snow/engine/avalanche/getter/getter.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ func (gh *getter) GetAncestors(ctx context.Context, nodeID ids.NodeID, requestID
110110
queue[0] = vertex
111111
ancestorsBytesLen := 0 // length, in bytes, of vertex and its ancestors
112112
ancestorsBytes := make([][]byte, 0, gh.cfg.AncestorsMaxContainersSent) // vertex and its ancestors in BFS order
113-
visited := set.Set[ids.ID]{} // IDs of vertices that have been in queue before
114-
visited.Add(vertex.ID())
113+
visited := set.Of(vertex.ID()) // IDs of vertices that have been in queue before
115114

116115
for len(ancestorsBytes) < gh.cfg.AncestorsMaxContainersSent && len(queue) > 0 && time.Since(startTime) < gh.cfg.MaxTimeGetAncestors {
117116
var vtx avalanche.Vertex

‎snow/engine/avalanche/getter/getter_test.go‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/ava-labs/avalanchego/snow/engine/avalanche/vertex"
1818
"github.com/ava-labs/avalanchego/snow/engine/common"
1919
"github.com/ava-labs/avalanchego/snow/validators"
20-
"github.com/ava-labs/avalanchego/utils/set"
2120
)
2221

2322
var errUnknownVertex = errors.New("unknown vertex")
@@ -132,12 +131,7 @@ func TestFilterAccepted(t *testing.T) {
132131

133132
require.NoError(bs.GetAccepted(context.Background(), ids.EmptyNodeID, 0, vtxIDs))
134133

135-
acceptedSet := set.Set[ids.ID]{}
136-
acceptedSet.Add(accepted...)
137-
138-
manager.GetVtxF = nil
139-
140-
require.Contains(acceptedSet, vtxID0)
141-
require.Contains(acceptedSet, vtxID1)
142-
require.NotContains(acceptedSet, vtxID2)
134+
require.Contains(accepted, vtxID0)
135+
require.Contains(accepted, vtxID1)
136+
require.NotContains(accepted, vtxID2)
143137
}

‎snow/engine/common/queue/jobs_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ func TestMissingJobs(t *testing.T) {
279279
numMissingIDs := jobs.NumMissingIDs()
280280
require.Equal(2, numMissingIDs)
281281

282-
missingIDSet := set.Set[ids.ID]{}
283-
missingIDSet.Add(jobs.MissingIDs()...)
282+
missingIDSet := set.Of(jobs.MissingIDs()...)
284283

285284
containsJob0ID := missingIDSet.Contains(job0ID)
286285
require.True(containsJob0ID)
@@ -296,8 +295,7 @@ func TestMissingJobs(t *testing.T) {
296295
require.NoError(err)
297296
require.NoError(jobs.SetParser(context.Background(), parser))
298297

299-
missingIDSet = set.Set[ids.ID]{}
300-
missingIDSet.Add(jobs.MissingIDs()...)
298+
missingIDSet = set.Of(jobs.MissingIDs()...)
301299

302300
containsJob0ID = missingIDSet.Contains(job0ID)
303301
require.True(containsJob0ID)

‎snow/engine/snowman/getter/getter_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/ava-labs/avalanchego/snow/engine/snowman/block"
2121
"github.com/ava-labs/avalanchego/snow/engine/snowman/block/mocks"
2222
"github.com/ava-labs/avalanchego/snow/validators"
23-
"github.com/ava-labs/avalanchego/utils/set"
2423
)
2524

2625
var errUnknownBlock = errors.New("unknown block")
@@ -172,11 +171,8 @@ func TestFilterAccepted(t *testing.T) {
172171

173172
require.NoError(bs.GetAccepted(context.Background(), ids.EmptyNodeID, 0, blkIDs))
174173

175-
acceptedSet := set.Set[ids.ID]{}
176-
acceptedSet.Add(accepted...)
177-
178-
require.Len(acceptedSet, 2)
179-
require.Contains(acceptedSet, blkID0)
180-
require.Contains(acceptedSet, blkID1)
181-
require.NotContains(acceptedSet, blkID2)
174+
require.Len(accepted, 2)
175+
require.Contains(accepted, blkID0)
176+
require.Contains(accepted, blkID1)
177+
require.NotContains(accepted, blkID2)
182178
}

‎snow/engine/snowman/transitive_test.go‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ func TestEngineQuery(t *testing.T) {
231231
require.False(*queried)
232232
*queried = true
233233
*queryRequestID = requestID
234-
vdrSet := set.Set[ids.NodeID]{}
235-
vdrSet.Add(vdr)
234+
vdrSet := set.Of(vdr)
236235
require.Equal(vdrSet, inVdrs)
237236
require.Equal(blk.ID(), blockID)
238237
require.Equal(uint64(1), requestedHeight)
@@ -282,8 +281,7 @@ func TestEngineQuery(t *testing.T) {
282281
require.False(*queried)
283282
*queried = true
284283
*queryRequestID = requestID
285-
vdrSet := set.Set[ids.NodeID]{}
286-
vdrSet.Add(vdr)
284+
vdrSet := set.Of(vdr)
287285
require.Equal(vdrSet, inVdrs)
288286
require.Equal(blk1.ID(), blockID)
289287
require.Equal(uint64(1), requestedHeight)
@@ -393,8 +391,7 @@ func TestEngineMultipleQuery(t *testing.T) {
393391
require.False(*queried)
394392
*queried = true
395393
*queryRequestID = requestID
396-
vdrSet := set.Set[ids.NodeID]{}
397-
vdrSet.Add(vdr0, vdr1, vdr2)
394+
vdrSet := set.Of(vdr0, vdr1, vdr2)
398395
require.Equal(vdrSet, inVdrs)
399396
require.Equal(blk0.ID(), blkID)
400397
require.Equal(uint64(1), requestedHeight)
@@ -467,8 +464,7 @@ func TestEngineMultipleQuery(t *testing.T) {
467464
require.False(*queried)
468465
*queried = true
469466
*secondQueryRequestID = requestID
470-
vdrSet := set.Set[ids.NodeID]{}
471-
vdrSet.Add(vdr0, vdr1, vdr2)
467+
vdrSet := set.Of(vdr0, vdr1, vdr2)
472468
require.Equal(vdrSet, inVdrs)
473469
require.Equal(blk1.ID(), blkID)
474470
require.Equal(uint64(1), requestedHeight)
@@ -637,8 +633,7 @@ func TestEnginePushQuery(t *testing.T) {
637633
sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, blkID ids.ID, requestedHeight uint64) {
638634
require.False(*queried)
639635
*queried = true
640-
vdrSet := set.Set[ids.NodeID]{}
641-
vdrSet.Add(vdr)
636+
vdrSet := set.Of(vdr)
642637
require.True(inVdrs.Equals(vdrSet))
643638
require.Equal(blk.ID(), blkID)
644639
require.Equal(uint64(1), requestedHeight)
@@ -684,8 +679,7 @@ func TestEngineBuildBlock(t *testing.T) {
684679
sender.SendPushQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, _ []byte, _ uint64) {
685680
require.False(*pushSent)
686681
*pushSent = true
687-
vdrSet := set.Set[ids.NodeID]{}
688-
vdrSet.Add(vdr)
682+
vdrSet := set.Of(vdr)
689683
require.Equal(vdrSet, inVdrs)
690684
}
691685

@@ -707,8 +701,7 @@ func TestEngineRepoll(t *testing.T) {
707701
sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], _ uint32, _ ids.ID, _ uint64) {
708702
require.False(*queried)
709703
*queried = true
710-
vdrSet := set.Set[ids.NodeID]{}
711-
vdrSet.Add(vdr)
704+
vdrSet := set.Of(vdr)
712705
require.Equal(vdrSet, inVdrs)
713706
}
714707

@@ -792,8 +785,7 @@ func TestVoteCanceling(t *testing.T) {
792785
require.False(*queried)
793786
*queried = true
794787
*queryRequestID = requestID
795-
vdrSet := set.Set[ids.NodeID]{}
796-
vdrSet.Add(vdr0, vdr1, vdr2)
788+
vdrSet := set.Of(vdr0, vdr1, vdr2)
797789
require.Equal(vdrSet, inVdrs)
798790
require.Equal(blk.Bytes(), blkBytes)
799791
require.Equal(uint64(1), requestedHeight)
@@ -1170,8 +1162,7 @@ func TestEngineBlockingChitResponse(t *testing.T) {
11701162
queryRequestID := new(uint32)
11711163
sender.SendPullQueryF = func(_ context.Context, inVdrs set.Set[ids.NodeID], requestID uint32, blkID ids.ID, requestedHeight uint64) {
11721164
*queryRequestID = requestID
1173-
vdrSet := set.Set[ids.NodeID]{}
1174-
vdrSet.Add(vdr)
1165+
vdrSet := set.Of(vdr)
11751166
require.Equal(vdrSet, inVdrs)
11761167
require.Equal(issuedBlk.ID(), blkID)
11771168
require.Equal(uint64(1), requestedHeight)
@@ -1664,8 +1655,7 @@ func TestEngineDoubleChit(t *testing.T) {
16641655
require.False((*queried))
16651656
*queried = true
16661657
*queryRequestID = requestID
1667-
vdrSet := set.Set[ids.NodeID]{}
1668-
vdrSet.Add(vdr0, vdr1)
1658+
vdrSet := set.Of(vdr0, vdr1)
16691659
require.Equal(vdrSet, inVdrs)
16701660
require.Equal(blk.ID(), blkID)
16711661
require.Equal(uint64(1), requestedHeight)
@@ -1771,8 +1761,7 @@ func TestEngineBuildBlockLimit(t *testing.T) {
17711761
reqID = rID
17721762
require.False(queried)
17731763
queried = true
1774-
vdrSet := set.Set[ids.NodeID]{}
1775-
vdrSet.Add(vdr)
1764+
vdrSet := set.Of(vdr)
17761765
require.Equal(vdrSet, inVdrs)
17771766
}
17781767

@@ -2272,8 +2261,7 @@ func TestEngineBubbleVotesThroughInvalidBlock(t *testing.T) {
22722261
require := require.New(t)
22732262

22742263
vdr, _, sender, vm, te, gBlk := setupDefaultConfig(t)
2275-
expectedVdrSet := set.Set[ids.NodeID]{}
2276-
expectedVdrSet.Add(vdr)
2264+
expectedVdrSet := set.Of(vdr)
22772265

22782266
// [blk1] is a child of [gBlk] and currently passes verification
22792267
blk1 := &snowman.TestBlock{
@@ -2347,8 +2335,7 @@ func TestEngineBubbleVotesThroughInvalidBlock(t *testing.T) {
23472335
*queried = true
23482336

23492337
*queryRequestID = requestID
2350-
vdrSet := set.Set[ids.NodeID]{}
2351-
vdrSet.Add(vdr)
2338+
vdrSet := set.Of(vdr)
23522339
require.Equal(vdrSet, inVdrs)
23532340
require.Equal(blk1.ID(), blkID)
23542341
require.Equal(uint64(1), requestedHeight)
@@ -2446,8 +2433,7 @@ func TestEngineBubbleVotesThroughInvalidChain(t *testing.T) {
24462433
require := require.New(t)
24472434

24482435
vdr, _, sender, vm, te, gBlk := setupDefaultConfig(t)
2449-
expectedVdrSet := set.Set[ids.NodeID]{}
2450-
expectedVdrSet.Add(vdr)
2436+
expectedVdrSet := set.Of(vdr)
24512437

24522438
// [blk1] is a child of [gBlk] and currently passes verification
24532439
blk1 := &snowman.TestBlock{

‎snow/event/blocker_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ func TestBlocker(t *testing.T) {
2828
a.dependencies = func() set.Set[ids.ID] {
2929
*calledDep = true
3030

31-
s := set.Set[ids.ID]{}
32-
s.Add(id0, id1)
31+
s := set.Of(id0, id1)
3332
return s
3433
}
3534
calledFill := new(bool)

0 commit comments

Comments
 (0)