Skip to content

Commit

Permalink
Merge pull request #598 from oasisprotocol/ptrus/feature/test-requires
Browse files Browse the repository at this point in the history 
tests: require.Nil -> require.NoError
  • Loading branch information
@ptrus
ptrus authored Jan 5, 2024
2 parents c5b0c4d + 1418912 commit e612eae
Show file tree
Hide file tree
Showing 14 changed files with 100 additions and 101 deletions.
8 changes: 4 additions & 4 deletions analyzer/runtime/extract_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func TestExtractSuccessfulEncryptedTx(t *testing.T) {
Error: nil,
}
blockData, err := ExtractRound(nodeapi.RuntimeBlockHeader{}, txrs, []nodeapi.RuntimeEvent{}, log.NewDefaultLogger("testing"))
require.Nil(t, err)
require.NoError(t, err)

verifyTxData(t, &expected, blockData.TransactionData[0])
}
Expand Down Expand Up @@ -165,7 +165,7 @@ func TestExtractFailedEncryptedTx(t *testing.T) {
},
}
blockData, err := ExtractRound(nodeapi.RuntimeBlockHeader{}, txrs, []nodeapi.RuntimeEvent{}, log.NewDefaultLogger("testing"))
require.Nil(t, err)
require.NoError(t, err)

verifyTxData(t, &expected, blockData.TransactionData[0])
}
Expand Down Expand Up @@ -198,7 +198,7 @@ func TestExtractSuccessfulUnecryptedTx(t *testing.T) {
Error: nil,
}
blockData, err := ExtractRound(nodeapi.RuntimeBlockHeader{}, txrs, []nodeapi.RuntimeEvent{}, log.NewDefaultLogger("testing"))
require.Nil(t, err)
require.NoError(t, err)

verifyTxData(t, &expected, blockData.TransactionData[0])
}
Expand Down Expand Up @@ -239,7 +239,7 @@ func TestExtractFailedUnecryptedTx(t *testing.T) {
},
}
blockData, err := ExtractRound(nodeapi.RuntimeBlockHeader{}, txrs, []nodeapi.RuntimeEvent{}, log.NewDefaultLogger("testing"))
require.Nil(t, err)
require.NoError(t, err)

verifyTxData(t, &expected, blockData.TransactionData[0])
}
Expand Down
10 changes: 5 additions & 5 deletions analyzer/util/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
// updated correctly.
func TestBackoffWait(t *testing.T) {
backoff, err := NewBackoff(time.Millisecond, 10*time.Second)
require.Nil(t, err)
require.NoError(t, err)

for i := 0; i < 10; i++ {
backoff.Failure()
Expand All @@ -28,7 +28,7 @@ func TestBackoffWait(t *testing.T) {
// reset correctly.
func TestBackoffReset(t *testing.T) {
backoff, err := NewBackoff(time.Millisecond, 10*time.Second)
require.Nil(t, err)
require.NoError(t, err)

backoff.Failure()
backoff.Reset()
Expand All @@ -39,7 +39,7 @@ func TestBackoffReset(t *testing.T) {
// appropriately upper bounded.
func TestBackoffMaximum(t *testing.T) {
backoff, err := NewBackoff(time.Millisecond, 10*time.Millisecond)
require.Nil(t, err)
require.NoError(t, err)

for i := 0; i < 10; i++ {
backoff.Failure()
Expand All @@ -51,7 +51,7 @@ func TestBackoffMaximum(t *testing.T) {
// appropriately lower bounded.
func TestBackoffMinimum(t *testing.T) {
backoff, err := NewBackoff(time.Millisecond, 10*time.Millisecond)
require.Nil(t, err)
require.NoError(t, err)

backoff.Failure()
for i := 0; i < 100; i++ {
Expand All @@ -63,7 +63,7 @@ func TestBackoffMinimum(t *testing.T) {
// TestBackoff tests the backoff logic.
func TestBackoff(t *testing.T) {
backoff, err := NewBackoff(100*time.Millisecond, 6*time.Second)
require.Nil(t, err)
require.NoError(t, err)

for i := 0; i < 2; i++ {
backoff.Failure()
Expand Down
26 changes: 13 additions & 13 deletions log/log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const tsRegex = `\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{0,9}Z`
func TestLoggerLogfmt(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtLogfmt, LevelDebug)
require.Nil(t, err)
require.NoError(t, err)

l.Debug("a statement")
require.Regexp(t, regexp.MustCompile(
Expand All @@ -25,7 +25,7 @@ func TestLoggerLogfmt(t *testing.T) {
func TestLoggerJSON(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelDebug)
require.Nil(t, err)
require.NoError(t, err)

l.Debug("a statement")
//nolint:goconst
Expand All @@ -43,7 +43,7 @@ func TestLoggerInvalid(t *testing.T) {
func TestWith(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelDebug)
require.Nil(t, err)
require.NoError(t, err)

l.With("height", 8000000).Debug("a statement")
require.Regexp(t, regexp.MustCompile(
Expand All @@ -54,7 +54,7 @@ func TestWith(t *testing.T) {
func TestWithModule(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelDebug)
require.Nil(t, err)
require.NoError(t, err)

l.WithModule("log-test-2").Debug("a statement")
require.Regexp(t, regexp.MustCompile(
Expand All @@ -65,13 +65,13 @@ func TestWithModule(t *testing.T) {
func TestDebug(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelInfo)
require.Nil(t, err)
require.NoError(t, err)

l.Debug("a statement")
require.Equal(t, 0, b.Len())

l, err = NewLogger("log-test", &b, FmtJSON, LevelDebug)
require.Nil(t, err)
require.NoError(t, err)

l.Debug("another statement")
require.NotEqual(t, 0, b.Len())
Expand All @@ -80,13 +80,13 @@ func TestDebug(t *testing.T) {
func TestInfo(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelWarn)
require.Nil(t, err)
require.NoError(t, err)

l.Info("a statement")
require.Equal(t, 0, b.Len())

l, err = NewLogger("log-test", &b, FmtJSON, LevelInfo)
require.Nil(t, err)
require.NoError(t, err)

l.Info("another statement")
require.NotEqual(t, 0, b.Len())
Expand All @@ -95,13 +95,13 @@ func TestInfo(t *testing.T) {
func TestWarn(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelError)
require.Nil(t, err)
require.NoError(t, err)

l.Warn("a statement")
require.Equal(t, 0, b.Len())

l, err = NewLogger("log-test", &b, FmtJSON, LevelWarn)
require.Nil(t, err)
require.NoError(t, err)

l.Warn("another statement")
require.NotEqual(t, 0, b.Len())
Expand All @@ -110,7 +110,7 @@ func TestWarn(t *testing.T) {
func TestError(t *testing.T) {
var b bytes.Buffer
l, err := NewLogger("log-test", &b, FmtJSON, LevelError)
require.Nil(t, err)
require.NoError(t, err)

l.Error("a statement")
require.NotEqual(t, 0, b.Len())
Expand All @@ -122,7 +122,7 @@ func TestLevel(t *testing.T) {

for _, l := range strings.Split(ls[1:len(ls)-1], ",") {
err := lvl.Set(l)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, l, lvl.String())
}
err := lvl.Set("invalid")
Expand All @@ -138,7 +138,7 @@ func TestFormat(t *testing.T) {

for _, f := range strings.Split(fs[1:len(fs)-1], ",") {
err := fmt.Set(f)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, f, fmt.String())
}
err := fmt.Set("invalid")
Expand Down
2 changes: 1 addition & 1 deletion storage/postgres/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func TestSendBatch(t *testing.T) {
err := client.QueryRow(context.Background(), `
SELECT name FROM films WHERE fid = $1;
`, i).Scan(&result)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, film, result)
}(i, film)
}
Expand Down
4 changes: 2 additions & 2 deletions storage/postgres/testutil/testutil.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
func NewTestClient(t *testing.T) *postgres.Client {
connString := os.Getenv("CI_TEST_CONN_STRING")
logger, err := log.NewLogger("postgres-test", os.Stdout, log.FmtJSON, log.LevelError)
require.Nil(t, err, "log.NewLogger")
require.NoError(t, err, "log.NewLogger")

client, err := postgres.NewClient(connString, logger)
require.Nil(t, err, "postgres.NewClient")
require.NoError(t, err, "postgres.NewClient")
return client
}
26 changes: 13 additions & 13 deletions tests/e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,49 +49,49 @@ func TestConsensusTransfer(t *testing.T) {
// API server should be up
var status storage.Status
err := tests.GetFrom("/", &status)
require.Nil(t, err)
require.NoError(t, err)

connString := "unix:/testnet/net-runner/network/validator-0/internal.sock"
conn, err := oasisGrpc.Dial(connString, grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
require.NoError(t, err)

ctx := context.Background()
cnsc := consensus.NewConsensusClient(conn)
doc, err := cnsc.GetGenesisDocument(ctx)
require.Nil(t, err)
require.NoError(t, err)
doc.SetChainContext()

hash := crypto.SHA512
seed := []byte("seeeeeeeeeeeeeeeeeeeeeeeeeeeeeed")
name := "transfer"
src, err := drbg.New(hash, seed, nil, []byte(fmt.Sprintf("txsource workload generator v1, workload %s", name)))
require.Nil(t, err)
require.NoError(t, err)

rng := rand.New(mathrand.New(src)) //nolint:gosec // G404: Use of weak random number generator (math/rand instead of crypto/rand)

fundingAccount, err := memorySigner.NewFactory().Generate(signature.SignerEntity, rng)
require.Nil(t, err)
require.NoError(t, err)

t.Log("Funding account address: ", staking.NewAddress(fundingAccount.Public()))

fac := memorySigner.NewFactory()

aliceAccount, err := fac.Generate(signature.SignerEntity, rng)
require.Nil(t, err)
require.NoError(t, err)
bobAccount, err := fac.Generate(signature.SignerEntity, rng)
require.Nil(t, err)
require.NoError(t, err)
aliceAddress := staking.NewAddress(aliceAccount.Public())
bobAddress := staking.NewAddress(bobAccount.Public())

t.Log("Alice address: ", aliceAddress)
t.Log("Bob address: ", bobAddress)

pd, err := consensus.NewStaticPriceDiscovery(uint64(0))
require.Nil(t, err)
require.NoError(t, err)
sm := consensus.NewSubmissionManager(cnsc, pd, 0)

_, testEntitySigner, err := entity.TestEntity()
require.Nil(t, err)
require.NoError(t, err)

// Seed Alice account
bw := workload.NewBaseWorkload("funding")
Expand All @@ -106,7 +106,7 @@ func TestConsensusTransfer(t *testing.T) {
// Bob account "does not exist". Technically, every valid account exists, but it has no balance or activity.
var account storage.Account
err = tests.GetFrom(fmt.Sprintf("/consensus/accounts/%s", bobAddress), &account)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, account.Address, bobAddress.String())
require.Zero(t, account.Nonce)
require.Zero(t, account.Available)
Expand All @@ -121,7 +121,7 @@ func TestConsensusTransfer(t *testing.T) {

time.Sleep(analyzerDelay)
err = tests.GetFrom(fmt.Sprintf("/consensus/accounts/%s", bobAddress), &account)
require.Nil(t, err)
require.NoError(t, err)
expected := common.NewBigInt(100000000)
require.Equal(t, expected, account.Available)

Expand All @@ -147,7 +147,7 @@ func TestConsensusTransfer(t *testing.T) {
// Bob account has correct delegation balance
time.Sleep(analyzerDelay)
err = tests.GetFrom(fmt.Sprintf("/consensus/accounts/%s", bobAddress), &account)
require.Nil(t, err)
require.NoError(t, err)
expectedDelegationsBalance := common.NewBigInt(25000000)
expectedAvailable := common.NewBigInt(75000000)
require.Equal(t, expectedDelegationsBalance, *account.DelegationsBalance)
Expand All @@ -156,7 +156,7 @@ func TestConsensusTransfer(t *testing.T) {
// Alice account has correct escrow balance
time.Sleep(analyzerDelay)
err = tests.GetFrom(fmt.Sprintf("/consensus/accounts/%s", aliceAddress), &account)
require.Nil(t, err)
require.NoError(t, err)
expectedEscrow := common.NewBigInt(25000000)
expectedAvailable = common.NewBigInt(9900000000)
require.Equal(t, expectedEscrow, account.Escrow)
Expand Down
6 changes: 3 additions & 3 deletions tests/http/v1/governance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestListProposals(t *testing.T) {

var list storage.ProposalList
err := tests.GetFrom("/consensus/proposals", &list)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 2, len(list.Proposals))

for i, proposal := range list.Proposals {
Expand All @@ -90,7 +90,7 @@ func TestGetProposal(t *testing.T) {
for i, testProposal := range testProposals {
var proposal storage.Proposal
err := tests.GetFrom(fmt.Sprintf("/consensus/proposals/%d", i+1), &proposal)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, testProposal, proposal)
}
}
Expand All @@ -106,7 +106,7 @@ func TestGetProposalVotes(t *testing.T) {
for i, expected := range expectedVotes {
var votes storage.ProposalVotes
err := tests.GetFrom(fmt.Sprintf("/consensus/proposals/%d/votes", i+1), &votes)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, uint64(i+1), votes.ProposalID)
require.Equal(t, expected, len(votes.Votes))
}
Expand Down
8 changes: 4 additions & 4 deletions tests/http/v1/registry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestListEntities(t *testing.T) {

var list storage.EntityList
err := tests.GetFrom("/consensus/entities", &list)
require.Nil(t, err)
require.NoError(t, err)

check := func(e storage.Entity) bool {
for _, entity := range list.Entities {
Expand Down Expand Up @@ -80,7 +80,7 @@ func TestGetEntity(t *testing.T) {

var entity storage.Entity
err := tests.GetFrom(fmt.Sprintf("/consensus/entities/%s", escape(testEntities[0].ID)), &entity)
require.Nil(t, err)
require.NoError(t, err)

require.Equal(t, testEntities[0].ID, entity.ID)
require.Equal(t, testEntities[0].Address, entity.Address)
Expand All @@ -98,7 +98,7 @@ func TestListEntityNodes(t *testing.T) {

var list storage.NodeList
err := tests.GetFrom(fmt.Sprintf("/consensus/entities/%s/nodes", escape(testNodes[0].EntityID)), &list)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, len(testNodes), len(list.Nodes))

for i, node := range list.Nodes {
Expand All @@ -119,7 +119,7 @@ func TestGetEntityNode(t *testing.T) {

var node storage.Node
err := tests.GetFrom(fmt.Sprintf("/consensus/entities/%s/nodes/%s", escape(testNodes[0].EntityID), escape(testNodes[0].ID)), &node)
require.Nil(t, err)
require.NoError(t, err)
// The expiration is dynamic, until we have oasis-net-runner with a halt epoch.
testNodes[0].Expiration = node.Expiration
require.Equal(t, testNodes[0], node)
Expand Down
4 changes: 2 additions & 2 deletions tests/http/v1/staking_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestListAccounts(t *testing.T) {

var list storage.AccountList
err := tests.GetFrom("/consensus/accounts?minAvailable=1000000000000000000", &list)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 1, len(list.Accounts))

// The big kahuna (Binance Staking).
Expand All @@ -60,7 +60,7 @@ func TestGetAccount(t *testing.T) {
for _, testAccount := range testAccounts {
var account storage.Account
err := tests.GetFrom(fmt.Sprintf("/consensus/accounts/%s", testAccount.Address), &account)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, testAccount, account)
}
}
2 changes: 1 addition & 1 deletion tests/http/v1/status_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestGetStatus(t *testing.T) {

var status storage.Status
err := tests.GetFrom("/", &status)
require.Nil(t, err)
require.NoError(t, err)

require.LessOrEqual(t, tests.GenesisHeight, status.LatestBlock)
}
Loading

0 comments on commit e612eae

Please sign in to comment.