style: use thelper (#16777)
This commit is contained in:
@@ -17,6 +17,7 @@ type TestAccount struct {
|
||||
}
|
||||
|
||||
func CreateKeyringAccounts(t *testing.T, kr keyring.Keyring, num int) []TestAccount {
|
||||
t.Helper()
|
||||
accounts := make([]TestAccount, num)
|
||||
for i := range accounts {
|
||||
record, _, err := kr.NewMnemonic(
|
||||
|
||||
+3
-2
@@ -37,13 +37,14 @@ type TestContext struct {
|
||||
CMS store.CommitMultiStore
|
||||
}
|
||||
|
||||
func DefaultContextWithDB(t testing.TB, key, tkey storetypes.StoreKey) TestContext {
|
||||
func DefaultContextWithDB(tb testing.TB, key, tkey storetypes.StoreKey) TestContext {
|
||||
tb.Helper()
|
||||
db := dbm.NewMemDB()
|
||||
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
|
||||
cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db)
|
||||
err := cms.LoadLatestVersion()
|
||||
assert.NoError(t, err)
|
||||
assert.NoError(tb, err)
|
||||
|
||||
ctx := sdk.NewContext(cms, cmtproto.Header{Time: time.Now()}, false, log.NewNopLogger())
|
||||
|
||||
|
||||
+12
-12
@@ -52,36 +52,36 @@ func ApplyMockIODiscardOutErr(c *cobra.Command) BufferReader {
|
||||
|
||||
// Write the given string to a new temporary file.
|
||||
// Returns an open file for the test to use.
|
||||
func WriteToNewTempFile(t testing.TB, s string) *os.File {
|
||||
t.Helper()
|
||||
func WriteToNewTempFile(tb testing.TB, s string) *os.File {
|
||||
tb.Helper()
|
||||
|
||||
fp := TempFile(t)
|
||||
fp := TempFile(tb)
|
||||
_, err := fp.WriteString(s)
|
||||
|
||||
require.Nil(t, err)
|
||||
require.Nil(tb, err)
|
||||
|
||||
return fp
|
||||
}
|
||||
|
||||
// TempFile returns a writable temporary file for the test to use.
|
||||
func TempFile(t testing.TB) *os.File {
|
||||
t.Helper()
|
||||
func TempFile(tb testing.TB) *os.File {
|
||||
tb.Helper()
|
||||
|
||||
fp, err := os.CreateTemp(GetTempDir(t), "")
|
||||
require.NoError(t, err)
|
||||
fp, err := os.CreateTemp(GetTempDir(tb), "")
|
||||
require.NoError(tb, err)
|
||||
|
||||
return fp
|
||||
}
|
||||
|
||||
// GetTempDir returns a writable temporary director for the test to use.
|
||||
func GetTempDir(t testing.TB) string {
|
||||
t.Helper()
|
||||
func GetTempDir(tb testing.TB) string {
|
||||
tb.Helper()
|
||||
// os.MkDir() is used instead of testing.T.TempDir()
|
||||
// see https://github.com/cosmos/cosmos-sdk/pull/8475 and
|
||||
// https://github.com/cosmos/cosmos-sdk/pull/10341 for
|
||||
// this change's rationale.
|
||||
tempdir, err := os.MkdirTemp("", "")
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { _ = os.RemoveAll(tempdir) })
|
||||
require.NoError(tb, err)
|
||||
tb.Cleanup(func() { _ = os.RemoveAll(tempdir) })
|
||||
return tempdir
|
||||
}
|
||||
|
||||
@@ -71,8 +71,7 @@ func SimulationOperations(app runtime.AppI, cdc codec.JSONCodec, config simtypes
|
||||
}
|
||||
}
|
||||
|
||||
//nolint:staticcheck // used for legacy testing
|
||||
simState.LegacyProposalContents = app.SimulationManager().GetProposalContents(simState)
|
||||
simState.LegacyProposalContents = app.SimulationManager().GetProposalContents(simState) //nolint:staticcheck // we're testing the old way here
|
||||
simState.ProposalMsgs = app.SimulationManager().GetProposalMsgs(simState)
|
||||
return app.SimulationManager().WeightedOperations(simState)
|
||||
}
|
||||
|
||||
@@ -110,6 +110,7 @@ func checkDiffResults(t *testing.T, store1, store2 storetypes.KVStore, noDiff bo
|
||||
}
|
||||
|
||||
func initTestStores(t *testing.T) (storetypes.KVStore, storetypes.KVStore) {
|
||||
t.Helper()
|
||||
db := dbm.NewMemDB()
|
||||
ms := rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
|
||||
|
||||
|
||||
@@ -96,6 +96,7 @@ func SignCheckDeliver(
|
||||
t *testing.T, txCfg client.TxConfig, app *baseapp.BaseApp, header types.Header, msgs []sdk.Msg,
|
||||
chainID string, accNums, accSeqs []uint64, expSimPass, expPass bool, priv ...cryptotypes.PrivKey,
|
||||
) (sdk.GasInfo, *sdk.Result, error) {
|
||||
t.Helper()
|
||||
tx, err := GenSignedMockTx(
|
||||
rand.New(rand.NewSource(time.Now().UnixNano())),
|
||||
txCfg,
|
||||
|
||||
Reference in New Issue
Block a user