Skip to content

Commit 008d0a3

Browse files
tim-barrytim-barry
committed
Prefer require.ErrorIs() in tests (2)
1 parent 15ad215 commit 008d0a3

21 files changed

+32
-50
lines changed

Diff for: ‎consensus/hotstuff/integration/liveness_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func Test2TimeoutOutof7Instances(t *testing.T) {
7474
wg.Add(1)
7575
go func(in *Instance) {
7676
err := in.Run()
77-
require.True(t, errors.Is(err, errStopCondition))
77+
require.ErrorIs(t, err, errStopCondition)
7878
wg.Done()
7979
}(in)
8080
}
@@ -210,7 +210,7 @@ func Test1TimeoutOutof5Instances(t *testing.T) {
210210
wg.Add(1)
211211
go func(in *Instance) {
212212
err := in.Run()
213-
require.True(t, errors.Is(err, errStopCondition))
213+
require.ErrorIs(t, err, errStopCondition)
214214
wg.Done()
215215
}(in)
216216
}
@@ -307,7 +307,7 @@ func TestBlockDelayIsHigherThanTimeout(t *testing.T) {
307307
wg.Add(1)
308308
go func(in *Instance) {
309309
err := in.Run()
310-
require.True(t, errors.Is(err, errStopCondition))
310+
require.ErrorIs(t, err, errStopCondition)
311311
wg.Done()
312312
}(in)
313313
}
@@ -389,7 +389,7 @@ func TestAsyncClusterStartup(t *testing.T) {
389389
wg.Add(1)
390390
go func(in *Instance) {
391391
err := in.Run()
392-
require.True(t, errors.Is(err, errStopCondition))
392+
require.ErrorIs(t, err, errStopCondition)
393393
wg.Done()
394394
}(in)
395395
}

Diff for: ‎engine/common/version/version_control_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package version
22

33
import (
44
"context"
5-
"errors"
65
"fmt"
76
"math"
87
"sort"
@@ -308,7 +307,7 @@ func TestVersionControlInitializationWithErrors(t *testing.T) {
308307

309308
compatible, err := vc.CompatibleAtBlock(height)
310309

311-
assert.True(t, errors.Is(err, ErrOutOfRange))
310+
assert.ErrorIs(t, err, ErrOutOfRange)
312311
assert.False(t, compatible)
313312
}
314313

Diff for: ‎engine/errors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (e FieldsError) Error() string {
7070
func TestTypeCheck(t *testing.T) {
7171
var err error
7272
err = NoFieldError
73-
require.True(t, errors.Is(err, NoFieldError))
73+
require.ErrorIs(t, err, NoFieldError)
7474

7575
err = FieldsError{
7676
Field1: "field1 missing",

Diff for: ‎module/signature/checksum_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package signature_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/stretchr/testify/require"
@@ -68,13 +67,13 @@ func Test_InvalidCheckSum(t *testing.T) {
6867
t.Run("checksum too short", func(t *testing.T) {
6968
for i := 0; i < 4; i++ {
7069
_, _, err := msig.SplitCheckSum(unittest.RandomBytes(i))
71-
require.True(t, errors.Is(err, msig.ErrInvalidChecksum))
70+
require.ErrorIs(t, err, msig.ErrInvalidChecksum)
7271
}
7372
})
7473

7574
t.Run("mismatching checksum", func(t *testing.T) {
7675
committee := unittest.IdentifierListFixture(20)
7776
_, err := msig.CompareAndExtract(committee, unittest.RandomBytes(112))
78-
require.True(t, errors.Is(err, msig.ErrInvalidChecksum))
77+
require.ErrorIs(t, err, msig.ErrInvalidChecksum)
7978
})
8079
}

Diff for: ‎module/state_synchronization/indexer/indexer_core_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package indexer
33
import (
44
"context"
55
"crypto/rand"
6-
"errors"
76
"fmt"
87
"os"
98
"testing"
@@ -568,7 +567,7 @@ func TestExecutionState_IndexBlockData(t *testing.T) {
568567

569568
err := newIndexCoreTest(t, blocks, execData).runIndexBlockData()
570569

571-
assert.True(t, errors.Is(err, storage.ErrNotFound))
570+
assert.ErrorIs(t, err, storage.ErrNotFound)
572571
})
573572

574573
}

Diff for: ‎storage/badger/cluster_payloads_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -34,7 +33,7 @@ func TestStoreRetrieveClusterPayload(t *testing.T) {
3433

3534
// storing again should error with key already exists
3635
err = store.Store(blockID, expected)
37-
require.True(t, errors.Is(err, storage.ErrAlreadyExists))
36+
require.ErrorIs(t, err, storage.ErrAlreadyExists)
3837
})
3938
}
4039

@@ -46,6 +45,6 @@ func TestClusterPayloadRetrieveWithoutStore(t *testing.T) {
4645
blockID := unittest.IdentifierFixture()
4746

4847
_, err := store.ByBlockID(blockID)
49-
assert.True(t, errors.Is(err, storage.ErrNotFound))
48+
assert.ErrorIs(t, err, storage.ErrNotFound)
5049
})
5150
}

Diff for: ‎storage/badger/commit_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -23,7 +22,7 @@ func TestCommitsStoreAndRetrieve(t *testing.T) {
2322

2423
// attempt to get a invalid commit
2524
_, err := store.ByBlockID(unittest.IdentifierFixture())
26-
assert.True(t, errors.Is(err, storage.ErrNotFound))
25+
assert.ErrorIs(t, err, storage.ErrNotFound)
2726

2827
// store a commit in db
2928
blockID := unittest.IdentifierFixture()

Diff for: ‎storage/badger/dkg_state_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"math/rand"
65
"testing"
76

@@ -57,7 +56,7 @@ func TestDKGState_BeaconKeys(t *testing.T) {
5756
// attempt to get a non-existent key
5857
t.Run("should error if retrieving non-existent key", func(t *testing.T) {
5958
_, err = store.RetrieveMyBeaconPrivateKey(epochCounter)
60-
assert.True(t, errors.Is(err, storage.ErrNotFound))
59+
assert.ErrorIs(t, err, storage.ErrNotFound)
6160
})
6261

6362
// attempt to store a nil key should fail - use DKGState.SetEndState(flow.DKGEndStateNoKey)
@@ -83,7 +82,7 @@ func TestDKGState_BeaconKeys(t *testing.T) {
8382
// test storing same key
8483
t.Run("should fail to store a key twice", func(t *testing.T) {
8584
err = store.InsertMyBeaconPrivateKey(epochCounter, expected)
86-
require.True(t, errors.Is(err, storage.ErrAlreadyExists))
85+
require.ErrorIs(t, err, storage.ErrAlreadyExists)
8786
})
8887
})
8988
}

Diff for: ‎storage/badger/epoch_commits_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -23,7 +22,7 @@ func TestEpochCommitStoreAndRetrieve(t *testing.T) {
2322

2423
// attempt to get a invalid commit
2524
_, err := store.ByID(unittest.IdentifierFixture())
26-
assert.True(t, errors.Is(err, storage.ErrNotFound))
25+
assert.ErrorIs(t, err, storage.ErrNotFound)
2726

2827
// store a commit in db
2928
expected := unittest.EpochCommitFixture()

Diff for: ‎storage/badger/epoch_setups_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -25,7 +24,7 @@ func TestEpochSetupStoreAndRetrieve(t *testing.T) {
2524

2625
// attempt to get a setup that doesn't exist
2726
_, err := store.ByID(unittest.IdentifierFixture())
28-
assert.True(t, errors.Is(err, storage.ErrNotFound))
27+
assert.ErrorIs(t, err, storage.ErrNotFound)
2928

3029
// store a setup in db
3130
expected := unittest.EpochSetupFixture()

Diff for: ‎storage/badger/guarantees_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -24,7 +23,7 @@ func TestGuaranteeStoreRetrieve(t *testing.T) {
2423

2524
// retrieve guarantee without stored
2625
_, err := store.ByCollectionID(expected.ID())
27-
require.True(t, errors.Is(err, storage.ErrNotFound))
26+
require.ErrorIs(t, err, storage.ErrNotFound)
2827

2928
// store guarantee
3029
err = store.Store(expected)

Diff for: ‎storage/badger/headers_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/onflow/flow-go/storage/badger/operation"
@@ -47,6 +46,6 @@ func TestHeaderRetrieveWithoutStore(t *testing.T) {
4746

4847
// retrieve header by height, should err as not store before height
4948
_, err := headers.ByHeight(header.Height)
50-
require.True(t, errors.Is(err, storage.ErrNotFound))
49+
require.ErrorIs(t, err, storage.ErrNotFound)
5150
})
5251
}

Diff for: ‎storage/badger/index_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -24,7 +23,7 @@ func TestIndexStoreRetrieve(t *testing.T) {
2423

2524
// retreive without store
2625
_, err := store.ByBlockID(blockID)
27-
require.True(t, errors.Is(err, storage.ErrNotFound))
26+
require.ErrorIs(t, err, storage.ErrNotFound)
2827

2928
// store index
3029
err = store.Store(blockID, expected)

Diff for: ‎storage/badger/operation/cluster_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package operation_test
22

33
import (
4-
"errors"
54
"fmt"
65
"math/rand"
76
"testing"
@@ -29,7 +28,7 @@ func TestClusterHeights(t *testing.T) {
2928
var actual flow.Identifier
3029
err = db.View(operation.LookupClusterBlockHeight(clusterID, height, &actual))
3130
t.Log(err)
32-
assert.True(t, errors.Is(err, storage.ErrNotFound))
31+
assert.ErrorIs(t, err, storage.ErrNotFound)
3332
})
3433

3534
t.Run("insert/retrieve", func(t *testing.T) {
@@ -50,7 +49,7 @@ func TestClusterHeights(t *testing.T) {
5049

5150
var actual flow.Identifier
5251
err = db.View(operation.LookupClusterBlockHeight(clusterID, height, &actual))
53-
assert.True(t, errors.Is(err, storage.ErrNotFound))
52+
assert.ErrorIs(t, err, storage.ErrNotFound)
5453

5554
err = db.Update(operation.IndexClusterBlockHeight(clusterID, height, expected))
5655
assert.Nil(t, err)
@@ -75,7 +74,7 @@ func TestClusterBoundaries(t *testing.T) {
7574
var actual uint64
7675
err = db.View(operation.RetrieveClusterFinalizedHeight(clusterID, &actual))
7776
t.Log(err)
78-
assert.True(t, errors.Is(err, storage.ErrNotFound))
77+
assert.ErrorIs(t, err, storage.ErrNotFound)
7978
})
8079

8180
t.Run("insert/retrieve", func(t *testing.T) {
@@ -99,7 +98,7 @@ func TestClusterBoundaries(t *testing.T) {
9998

10099
var actual uint64
101100
err = db.View(operation.RetrieveClusterFinalizedHeight(clusterID, &actual))
102-
assert.True(t, errors.Is(err, storage.ErrNotFound))
101+
assert.ErrorIs(t, err, storage.ErrNotFound)
103102

104103
err = db.Update(operation.InsertClusterFinalizedHeight(clusterID, expected))
105104
assert.Nil(t, err)

Diff for: ‎storage/badger/payloads_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -53,6 +52,6 @@ func TestPayloadRetreiveWithoutStore(t *testing.T) {
5352
blockID := unittest.IdentifierFixture()
5453

5554
_, err := store.ByBlockID(blockID)
56-
require.True(t, errors.Is(err, storage.ErrNotFound))
55+
require.ErrorIs(t, err, storage.ErrNotFound)
5756
})
5857
}

Diff for: ‎storage/badger/procedure/children_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package procedure_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -71,7 +70,7 @@ func TestIndexZeroParent(t *testing.T) {
7170
// zero id should have no children
7271
var retrievedIDs flow.IdentifierList
7372
err = db.View(procedure.LookupBlockChildren(flow.ZeroID, &retrievedIDs))
74-
require.True(t, errors.Is(err, storage.ErrNotFound))
73+
require.ErrorIs(t, err, storage.ErrNotFound)
7574
})
7675
}
7776

Diff for: ‎storage/badger/seals_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -21,10 +20,10 @@ func TestRetrieveWithoutStore(t *testing.T) {
2120
store := badgerstorage.NewSeals(metrics, db)
2221

2322
_, err := store.ByID(unittest.IdentifierFixture())
24-
require.True(t, errors.Is(err, storage.ErrNotFound))
23+
require.ErrorIs(t, err, storage.ErrNotFound)
2524

2625
_, err = store.HighestInFork(unittest.IdentifierFixture())
27-
require.True(t, errors.Is(err, storage.ErrNotFound))
26+
require.ErrorIs(t, err, storage.ErrNotFound)
2827
})
2928
}
3029

Diff for: ‎storage/badger/transactions_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package badger_test
22

33
import (
4-
"errors"
54
"testing"
65

76
"github.com/dgraph-io/badger/v2"
@@ -43,6 +42,6 @@ func TestTransactionRetrieveWithoutStore(t *testing.T) {
4342

4443
// attempt to get a invalid transaction
4544
_, err := store.ByID(unittest.IdentifierFixture())
46-
assert.True(t, errors.Is(err, storage.ErrNotFound))
45+
assert.ErrorIs(t, err, storage.ErrNotFound)
4746
})
4847
}

Diff for: ‎storage/pebble/registers_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"testing"
1111

1212
"github.com/cockroachdb/pebble"
13-
"github.com/pkg/errors"
1413
"github.com/stretchr/testify/assert"
1514
"github.com/stretchr/testify/require"
1615

@@ -28,7 +27,7 @@ func TestRegisters_Initialize(t *testing.T) {
2827
_, err := NewRegisters(p, PruningDisabled)
2928
require.Error(t, err)
3029
// verify the error type
31-
require.True(t, errors.Is(err, storage.ErrNotBootstrapped))
30+
require.ErrorIs(t, err, storage.ErrNotBootstrapped)
3231
err = os.RemoveAll(dir)
3332
require.NoError(t, err)
3433
}

Diff for: ‎storage/store/approvals_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestApprovalStoreTwoDifferentApprovalsShouldFail(t *testing.T) {
7777

7878
err = store.Index(approval1.Body.ExecutionResultID, approval1.Body.ChunkIndex, approval2.ID())
7979
require.Error(t, err)
80-
require.True(t, errors.Is(err, storage.ErrDataMismatch))
80+
require.ErrorIs(t, err, storage.ErrDataMismatch)
8181
})
8282
}
8383

0 commit comments

Comments
 (0)