Skip to content

Commit 0d8c59e

Browse files
authored
Use require library functions in more tests (ava-labs#1451)
1 parent ef6a2a2 commit 0d8c59e

File tree

5 files changed

+78
-84
lines changed

5 files changed

+78
-84
lines changed

config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func TestGetSubnetConfigsFromFlags(t *testing.T) {
477477
"entry with no config": {
478478
givenJSON: `{"2Ctt6eGAeo4MLqTmGa7AdRecuVMPGWEX9wSsCLBYrLhX4a394i":{}}`,
479479
testF: func(require *require.Assertions, given map[ids.ID]subnets.Config) {
480-
require.True(len(given) == 1)
480+
require.Len(given, 1)
481481
id, _ := ids.FromString("2Ctt6eGAeo4MLqTmGa7AdRecuVMPGWEX9wSsCLBYrLhX4a394i")
482482
config, ok := given[id]
483483
require.True(ok)

snow/engine/snowman/syncer/state_syncer_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func TestStateSyncLocalSummaryIsIncludedAmongFrontiersIfAvailable(t *testing.T)
178178
require.NoError(syncer.Connected(context.Background(), vdr.NodeID, version.CurrentApp))
179179
}
180180

181-
require.True(syncer.locallyAvailableSummary == localSummary)
181+
require.Equal(localSummary, syncer.locallyAvailableSummary)
182182
ws, ok := syncer.weightedSummaries[summaryID]
183183
require.True(ok)
184184
require.True(bytes.Equal(ws.summary.Bytes(), summaryBytes))
@@ -251,14 +251,14 @@ func TestBeaconsAreReachedForFrontiersUponStartup(t *testing.T) {
251251
}
252252

253253
// check that vdrs are reached out for frontiers
254-
require.True(len(contactedFrontiersProviders) == safeMath.Min(vdrs.Len(), common.MaxOutstandingBroadcastRequests))
254+
require.Len(contactedFrontiersProviders, safeMath.Min(vdrs.Len(), common.MaxOutstandingBroadcastRequests))
255255
for beaconID := range contactedFrontiersProviders {
256256
// check that beacon is duly marked as reached out
257257
require.True(syncer.pendingSeeders.Contains(beaconID))
258258
}
259259

260260
// check that, obviously, no summary is yet registered
261-
require.True(len(syncer.weightedSummaries) == 0)
261+
require.Empty(syncer.weightedSummaries)
262262
}
263263

264264
func TestUnRequestedStateSummaryFrontiersAreDropped(t *testing.T) {
@@ -319,8 +319,8 @@ func TestUnRequestedStateSummaryFrontiersAreDropped(t *testing.T) {
319319
math.MaxInt32,
320320
summaryBytes,
321321
))
322-
require.True(syncer.pendingSeeders.Contains(responsiveBeaconID)) // responsiveBeacon still pending
323-
require.True(len(syncer.weightedSummaries) == 0)
322+
require.Contains(syncer.pendingSeeders, responsiveBeaconID) // responsiveBeacon still pending
323+
require.Empty(syncer.weightedSummaries)
324324

325325
// check a response from unsolicited node is dropped
326326
unsolicitedNodeID := ids.GenerateTestNodeID()
@@ -330,7 +330,7 @@ func TestUnRequestedStateSummaryFrontiersAreDropped(t *testing.T) {
330330
responsiveBeaconReqID,
331331
summaryBytes,
332332
))
333-
require.True(len(syncer.weightedSummaries) == 0)
333+
require.Empty(syncer.weightedSummaries)
334334

335335
// check a valid response is duly recorded
336336
require.NoError(syncer.StateSummaryFrontier(
@@ -341,7 +341,7 @@ func TestUnRequestedStateSummaryFrontiersAreDropped(t *testing.T) {
341341
))
342342

343343
// responsiveBeacon not pending anymore
344-
require.False(syncer.pendingSeeders.Contains(responsiveBeaconID))
344+
require.NotContains(syncer.pendingSeeders, responsiveBeaconID)
345345

346346
// valid summary is recorded
347347
ws, ok := syncer.weightedSummaries[summaryID]
@@ -413,11 +413,11 @@ func TestMalformedStateSummaryFrontiersAreDropped(t *testing.T) {
413413
))
414414

415415
// responsiveBeacon not pending anymore
416-
require.False(syncer.pendingSeeders.Contains(responsiveBeaconID))
416+
require.NotContains(syncer.pendingSeeders, responsiveBeaconID)
417417

418418
// invalid summary is not recorded
419419
require.True(isSummaryDecoded)
420-
require.True(len(syncer.weightedSummaries) == 0)
420+
require.Empty(syncer.weightedSummaries)
421421

422422
// even in case of invalid summaries, other listed vdrs
423423
// are reached for data
@@ -481,8 +481,8 @@ func TestLateResponsesFromUnresponsiveFrontiersAreNotRecorded(t *testing.T) {
481481
))
482482

483483
// unresponsiveBeacon not pending anymore
484-
require.False(syncer.pendingSeeders.Contains(unresponsiveBeaconID))
485-
require.True(syncer.failedSeeders.Contains(unresponsiveBeaconID))
484+
require.NotContains(syncer.pendingSeeders, unresponsiveBeaconID)
485+
require.Contains(syncer.failedSeeders, unresponsiveBeaconID)
486486

487487
// even in case of timeouts, other listed vdrs
488488
// are reached for data
@@ -509,7 +509,7 @@ func TestLateResponsesFromUnresponsiveFrontiersAreNotRecorded(t *testing.T) {
509509
))
510510

511511
// late summary is not recorded
512-
require.True(len(syncer.weightedSummaries) == 0)
512+
require.Empty(syncer.weightedSummaries)
513513
}
514514

515515
func TestStateSyncIsRestartedIfTooManyFrontierSeedersTimeout(t *testing.T) {
@@ -600,10 +600,10 @@ func TestStateSyncIsRestartedIfTooManyFrontierSeedersTimeout(t *testing.T) {
600600
}
601601

602602
// check that some frontier seeders are reached again for the frontier
603-
require.True(syncer.pendingSeeders.Len() > 0)
603+
require.NotEmpty(syncer.pendingSeeders)
604604

605605
// check that no vote requests are issued
606-
require.True(len(contactedVoters) == 0)
606+
require.Empty(contactedVoters)
607607
}
608608

609609
func TestVoteRequestsAreSentAsAllFrontierBeaconsResponded(t *testing.T) {
@@ -768,8 +768,8 @@ func TestUnRequestedVotesAreDropped(t *testing.T) {
768768
))
769769

770770
// responsiveVoter still pending
771-
require.True(syncer.pendingVoters.Contains(responsiveVoterID))
772-
require.True(syncer.weightedSummaries[summaryID].weight == 0)
771+
require.Contains(syncer.pendingVoters, responsiveVoterID)
772+
require.Zero(syncer.weightedSummaries[summaryID].weight)
773773

774774
// check a response from unsolicited node is dropped
775775
unsolicitedVoterID := ids.GenerateTestNodeID()
@@ -779,7 +779,7 @@ func TestUnRequestedVotesAreDropped(t *testing.T) {
779779
responsiveVoterReqID,
780780
[]ids.ID{summaryID},
781781
))
782-
require.True(syncer.weightedSummaries[summaryID].weight == 0)
782+
require.Zero(syncer.weightedSummaries[summaryID].weight)
783783

784784
// check a valid response is duly recorded
785785
require.NoError(syncer.AcceptedStateSummary(
@@ -790,7 +790,7 @@ func TestUnRequestedVotesAreDropped(t *testing.T) {
790790
))
791791

792792
// responsiveBeacon not pending anymore
793-
require.False(syncer.pendingSeeders.Contains(responsiveVoterID))
793+
require.NotContains(syncer.pendingSeeders, responsiveVoterID)
794794
voterWeight := vdrs.GetWeight(responsiveVoterID)
795795
require.Equal(voterWeight, syncer.weightedSummaries[summaryID].weight)
796796

@@ -890,14 +890,14 @@ func TestVotesForUnknownSummariesAreDropped(t *testing.T) {
890890
require.False(found)
891891

892892
// check that responsiveVoter cannot cast another vote
893-
require.False(syncer.pendingSeeders.Contains(responsiveVoterID))
893+
require.NotContains(syncer.pendingSeeders, responsiveVoterID)
894894
require.NoError(syncer.AcceptedStateSummary(
895895
context.Background(),
896896
responsiveVoterID,
897897
responsiveVoterReqID,
898898
[]ids.ID{summaryID},
899899
))
900-
require.True(syncer.weightedSummaries[summaryID].weight == 0)
900+
require.Zero(syncer.weightedSummaries[summaryID].weight)
901901

902902
// other listed voters are reached out, even in the face of vote
903903
// on unknown summary

vms/platformvm/blocks/builder/network_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ func TestMempoolNewLocaTxIsGossiped(t *testing.T) {
147147
err = env.Builder.Add(tx)
148148
require.NoError(err)
149149

150-
require.True(gossipedBytes == nil)
150+
require.Nil(gossipedBytes)
151151
}

vms/proposervm/indexer/height_indexer_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestHeightBlockIndexPostFork(t *testing.T) {
9494
// check that height index is fully built
9595
loadedForkHeight, err := storedState.GetForkHeight()
9696
require.NoError(err)
97-
require.True(loadedForkHeight == 1)
97+
require.Equal(uint64(1), loadedForkHeight)
9898
for height := uint64(1); height <= blkNumber; height++ {
9999
_, err := storedState.GetBlockIDAtHeight(height)
100100
require.NoError(err)
@@ -174,7 +174,7 @@ func TestHeightBlockIndexAcrossFork(t *testing.T) {
174174
// check that height index is fully built
175175
loadedForkHeight, err := storedState.GetForkHeight()
176176
require.NoError(err)
177-
require.True(loadedForkHeight == forkHeight)
177+
require.Equal(forkHeight, loadedForkHeight)
178178
for height := uint64(0); height < forkHeight; height++ {
179179
_, err := storedState.GetBlockIDAtHeight(height)
180180
require.ErrorIs(err, database.ErrNotFound)
@@ -270,7 +270,7 @@ func TestHeightBlockIndexResumeFromCheckPoint(t *testing.T) {
270270
// check that height index is fully built
271271
loadedForkHeight, err := storedState.GetForkHeight()
272272
require.NoError(err)
273-
require.True(loadedForkHeight == forkHeight)
273+
require.Equal(forkHeight, loadedForkHeight)
274274
for height := forkHeight; height <= checkpointBlk.Height(); height++ {
275275
_, err := storedState.GetBlockIDAtHeight(height)
276276
require.NoError(err)

0 commit comments

Comments
 (0)