Skip to content

Commit 3a3dafa

Browse files
dhrubabasudhrubabasu
committed
first pass
1 parent 0d8c59e commit 3a3dafa

File tree

9 files changed

+95
-93
lines changed

9 files changed

+95
-93
lines changed

‎.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ linters-settings:
6767
forbid:
6868
- 'require\.Error$(# ErrorIs should be used instead)?'
6969
- 'require\.ErrorContains$(# ErrorIs should be used instead)?'
70+
- 'require\.EqualValues$(# Equal should be used instead)?'
7071
exclude_godoc_examples: false
7172
# https://golangci-lint.run/usage/linters#gosec
7273
gosec:

‎api/admin/client_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,10 @@ func TestGetLoggerLevel(t *testing.T) {
337337
tt.loggerName,
338338
)
339339
require.ErrorIs(err, tt.clientErr)
340-
if tt.clientErr == nil {
341-
require.EqualValues(tt.serviceResponse, res)
340+
if tt.clientErr != nil {
341+
return
342342
}
343+
require.Equal(tt.serviceResponse, res)
343344
})
344345
}
345346
}

‎indexer/client_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestIndexClient(t *testing.T) {
4242
}
4343
index, err := client.GetIndex(context.Background(), ids.Empty)
4444
require.NoError(err)
45-
require.EqualValues(5, index)
45+
require.Equal(uint64(5), index)
4646
}
4747
{
4848
// Test GetLastAccepted
@@ -64,9 +64,9 @@ func TestIndexClient(t *testing.T) {
6464
}
6565
container, index, err := client.GetLastAccepted(context.Background())
6666
require.NoError(err)
67-
require.EqualValues(id, container.ID)
68-
require.EqualValues(bytes, container.Bytes)
69-
require.EqualValues(index, 10)
67+
require.Equal(id, container.ID)
68+
require.Equal(bytes, container.Bytes)
69+
require.Equal(uint64(10), index)
7070
}
7171
{
7272
// Test GetContainerRange
@@ -88,8 +88,8 @@ func TestIndexClient(t *testing.T) {
8888
containers, err := client.GetContainerRange(context.Background(), 1, 10)
8989
require.NoError(err)
9090
require.Len(containers, 1)
91-
require.EqualValues(id, containers[0].ID)
92-
require.EqualValues(bytes, containers[0].Bytes)
91+
require.Equal(id, containers[0].ID)
92+
require.Equal(bytes, containers[0].Bytes)
9393
}
9494
{
9595
// Test IsAccepted
@@ -125,8 +125,8 @@ func TestIndexClient(t *testing.T) {
125125
}
126126
container, index, err := client.GetContainerByID(context.Background(), id)
127127
require.NoError(err)
128-
require.EqualValues(id, container.ID)
129-
require.EqualValues(bytes, container.Bytes)
130-
require.EqualValues(index, 10)
128+
require.Equal(id, container.ID)
129+
require.Equal(bytes, container.Bytes)
130+
require.Equal(uint64(10), index)
131131
}
132132
}

‎indexer/index_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ func TestIndex(t *testing.T) {
4949

5050
lastAcceptedIndex, ok := idx.lastAcceptedIndex()
5151
require.True(ok)
52-
require.EqualValues(i, lastAcceptedIndex)
53-
require.EqualValues(i+1, idx.nextAcceptedIndex)
52+
require.Equal(i, lastAcceptedIndex)
53+
require.Equal(i+1, idx.nextAcceptedIndex)
5454

5555
gotContainer, err := idx.GetContainerByID(containerID)
5656
require.NoError(err)
5757
require.Equal(containerBytes, gotContainer.Bytes)
5858

5959
gotIndex, err := idx.GetIndex(containerID)
6060
require.NoError(err)
61-
require.EqualValues(i, gotIndex)
61+
require.Equal(i, gotIndex)
6262

6363
gotContainer, err = idx.GetContainerByIndex(i)
6464
require.NoError(err)
@@ -104,7 +104,7 @@ func TestIndex(t *testing.T) {
104104
for _, container := range containersList {
105105
require.False(sawContainers.Contains(container.ID)) // Should only see this container once
106106
require.Contains(containers, container.ID)
107-
require.EqualValues(containers[container.ID], container.Bytes)
107+
require.Equal(containers[container.ID], container.Bytes)
108108
// Timestamps should be non-decreasing
109109
require.True(container.Timestamp >= lastTimestamp)
110110
lastTimestamp = container.Timestamp
@@ -150,8 +150,8 @@ func TestIndexGetContainerByRangeMaxPageSize(t *testing.T) {
150150
containers, err = idx.GetContainerRange(MaxFetchedByRange-1, MaxFetchedByRange)
151151
require.NoError(err)
152152
require.Len(containers, 2)
153-
require.EqualValues(containers[1], containers2[MaxFetchedByRange-1])
154-
require.EqualValues(containers[0], containers2[MaxFetchedByRange-2])
153+
require.Equal(containers[1], containers2[MaxFetchedByRange-1])
154+
require.Equal(containers[0], containers2[MaxFetchedByRange-2])
155155
}
156156

157157
func TestDontIndexSameContainerTwice(t *testing.T) {
@@ -173,5 +173,5 @@ func TestDontIndexSameContainerTwice(t *testing.T) {
173173
require.ErrorIs(err, errNoContainerAtIndex)
174174
gotContainer, err := idx.GetContainerByID(containerID)
175175
require.NoError(err)
176-
require.EqualValues(gotContainer.Bytes, []byte{1, 2, 3}, "should not have accepted same container twice")
176+
require.Equal([]byte{1, 2, 3}, gotContainer.Bytes)
177177
}

‎indexer/indexer_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ func TestIndexer(t *testing.T) {
174174
previouslyIndexed, err = idxr.previouslyIndexed(chain1Ctx.ChainID)
175175
require.NoError(err)
176176
require.True(previouslyIndexed)
177-
require.EqualValues(1, server.timesCalled)
178-
require.EqualValues("index/chain1", server.bases[0])
179-
require.EqualValues("/block", server.endpoints[0])
177+
require.Equal(1, server.timesCalled)
178+
require.Equal("index/chain1", server.bases[0])
179+
require.Equal("/block", server.endpoints[0])
180180
require.Len(idxr.blockIndices, 1)
181181
require.Len(idxr.txIndices, 0)
182182
require.Len(idxr.vtxIndices, 0)
@@ -207,7 +207,7 @@ func TestIndexer(t *testing.T) {
207207
// Verify GetIndex is right
208208
index, err := blkIdx.GetIndex(blkID)
209209
require.NoError(err)
210-
require.EqualValues(0, index)
210+
require.Zero(index)
211211

212212
// Verify GetContainerByIndex is right
213213
container, err = blkIdx.GetContainerByIndex(0)
@@ -257,7 +257,7 @@ func TestIndexer(t *testing.T) {
257257
container, err = blkIdx.GetLastAccepted()
258258
require.NoError(err)
259259
require.Equal(blkID, container.ID)
260-
require.EqualValues(1, server.timesCalled) // block index for chain
260+
require.Equal(1, server.timesCalled) // block index for chain
261261
require.Contains(server.endpoints, "/block")
262262

263263
// Register a DAG chain
@@ -272,7 +272,7 @@ func TestIndexer(t *testing.T) {
272272
dagVM := vertex.NewMockLinearizableVM(ctrl)
273273
idxr.RegisterChain("chain2", chain2Ctx, dagVM)
274274
require.NoError(err)
275-
require.EqualValues(4, server.timesCalled) // block index for chain, block index for dag, vtx index, tx index
275+
require.Equal(4, server.timesCalled) // block index for chain, block index for dag, vtx index, tx index
276276
require.Contains(server.bases, "index/chain2")
277277
require.Contains(server.endpoints, "/block")
278278
require.Contains(server.endpoints, "/vtx")
@@ -307,7 +307,7 @@ func TestIndexer(t *testing.T) {
307307
// Verify GetIndex is right
308308
index, err = vtxIdx.GetIndex(vtxID)
309309
require.NoError(err)
310-
require.EqualValues(0, index)
310+
require.Zero(index)
311311

312312
// Verify GetContainerByIndex is right
313313
vtx, err = vtxIdx.GetContainerByIndex(0)
@@ -356,7 +356,7 @@ func TestIndexer(t *testing.T) {
356356
// Verify GetIndex is right
357357
index, err = txIdx.GetIndex(txID)
358358
require.NoError(err)
359-
require.EqualValues(0, index)
359+
require.Zero(index)
360360

361361
// Verify GetContainerByIndex is right
362362
tx, err = txIdx.GetContainerByIndex(0)
@@ -373,13 +373,13 @@ func TestIndexer(t *testing.T) {
373373
// happen on the block/tx index. Similar for tx.
374374
lastAcceptedTx, err := txIdx.GetLastAccepted()
375375
require.NoError(err)
376-
require.EqualValues(txID, lastAcceptedTx.ID)
376+
require.Equal(txID, lastAcceptedTx.ID)
377377
lastAcceptedVtx, err := vtxIdx.GetLastAccepted()
378378
require.NoError(err)
379-
require.EqualValues(vtxID, lastAcceptedVtx.ID)
379+
require.Equal(vtxID, lastAcceptedVtx.ID)
380380
lastAcceptedBlk, err := blkIdx.GetLastAccepted()
381381
require.NoError(err)
382-
require.EqualValues(blkID, lastAcceptedBlk.ID)
382+
require.Equal(blkID, lastAcceptedBlk.ID)
383383

384384
// Close the indexer again
385385
require.NoError(config.DB.(*versiondb.Database).Commit())
@@ -397,13 +397,13 @@ func TestIndexer(t *testing.T) {
397397
// Verify state
398398
lastAcceptedTx, err = idxr.txIndices[chain2Ctx.ChainID].GetLastAccepted()
399399
require.NoError(err)
400-
require.EqualValues(txID, lastAcceptedTx.ID)
400+
require.Equal(txID, lastAcceptedTx.ID)
401401
lastAcceptedVtx, err = idxr.vtxIndices[chain2Ctx.ChainID].GetLastAccepted()
402402
require.NoError(err)
403-
require.EqualValues(vtxID, lastAcceptedVtx.ID)
403+
require.Equal(vtxID, lastAcceptedVtx.ID)
404404
lastAcceptedBlk, err = idxr.blockIndices[chain1Ctx.ChainID].GetLastAccepted()
405405
require.NoError(err)
406-
require.EqualValues(blkID, lastAcceptedBlk.ID)
406+
require.Equal(blkID, lastAcceptedBlk.ID)
407407
}
408408

409409
// Make sure the indexer doesn't allow incomplete indices unless explicitly allowed

‎network/network_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ func TestSend(t *testing.T) {
341341
toSend := set.Set[ids.NodeID]{}
342342
toSend.Add(nodeIDs[1])
343343
sentTo := net0.Send(outboundGetMsg, toSend, constants.PrimaryNetworkID, subnets.NoOpAllower)
344-
require.EqualValues(toSend, sentTo)
344+
require.Equal(toSend, sentTo)
345345

346346
inboundGetMsg := <-received
347347
require.Equal(message.GetOp, inboundGetMsg.Op())

‎network/peer/ip_signer_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ func TestIPSigner(t *testing.T) {
3434

3535
signedIP1, err := s.GetSignedIP()
3636
require.NoError(err)
37-
require.EqualValues(dynIP.IPPort(), signedIP1.IPPort)
38-
require.EqualValues(10, signedIP1.Timestamp)
37+
require.Equal(dynIP.IPPort(), signedIP1.IPPort)
38+
require.Equal(uint64(10), signedIP1.Timestamp)
3939

4040
s.clock.Set(time.Unix(11, 0))
4141

4242
signedIP2, err := s.GetSignedIP()
4343
require.NoError(err)
44-
require.EqualValues(dynIP.IPPort(), signedIP2.IPPort)
45-
require.EqualValues(10, signedIP2.Timestamp)
46-
require.EqualValues(signedIP1.Signature, signedIP2.Signature)
44+
require.Equal(dynIP.IPPort(), signedIP2.IPPort)
45+
require.Equal(uint64(10), signedIP2.Timestamp)
46+
require.Equal(signedIP1.Signature, signedIP2.Signature)
4747

4848
dynIP.SetIP(net.IPv4(1, 2, 3, 4))
4949

5050
signedIP3, err := s.GetSignedIP()
5151
require.NoError(err)
52-
require.EqualValues(dynIP.IPPort(), signedIP3.IPPort)
53-
require.EqualValues(11, signedIP3.Timestamp)
52+
require.Equal(dynIP.IPPort(), signedIP3.IPPort)
53+
require.Equal(uint64(11), signedIP3.Timestamp)
5454
require.NotEqualValues(signedIP2.Signature, signedIP3.Signature)
5555
}

0 commit comments

Comments
 (0)