replace testutil.NewTestCaseDir() with Go1.15's T.TempDir()

README.md

@@ -49,7 +49,7 @@ It is being used to build [`Gaia`](https://github.com/cosmos/gaia), the first im
 **WARNING**: The SDK has mostly stabilized, but we are still making some
 breaking changes.
 
-**Note**: Requires [Go 1.14+](https://golang.org/dl/)
+**Note**: Requires [Go 1.15+](https://golang.org/dl/)
 
 ## Quick Start
 

client/keys/add_ledger_test.go

@@ -37,9 +37,7 @@ func Test_runAddCmdLedgerWithCustomCoinType(t *testing.T) {
 	cmd.Flags().AddFlagSet(Commands("home").PersistentFlags())
 
 	// Prepare a keybase
-	kbHome, kbCleanUp := testutil.NewTestCaseDir(t)
-	require.NotNil(t, kbHome)
-	t.Cleanup(kbCleanUp)
+	kbHome := t.TempDir()
 
 	cmd.SetArgs([]string{
 		"keyname1",
@@ -86,11 +84,7 @@ func Test_runAddCmdLedger(t *testing.T) {
 	cmd := AddKeyCommand()
 	cmd.Flags().AddFlagSet(Commands("home").PersistentFlags())
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)
-
-	// Prepare a keybase
-	kbHome, kbCleanUp := testutil.NewTestCaseDir(t)
-	require.NotNil(t, kbHome)
-	t.Cleanup(kbCleanUp)
+	kbHome := t.TempDir()
 
 	cmd.SetArgs([]string{
 		"keyname1",

client/keys/add_test.go

@@ -20,12 +20,9 @@ func Test_runAddCmdBasic(t *testing.T) {
 	cmd.Flags().AddFlagSet(Commands("home").PersistentFlags())
 
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)
-
-	kbHome, kbCleanUp := testutil.NewTestCaseDir(t)
-	require.NotNil(t, kbHome)
-	t.Cleanup(kbCleanUp)
-
+	kbHome := t.TempDir()
 	kb, err := keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, kbHome, mockIn)
+
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = kb.Delete("keyname1")

client/keys/delete_test.go

@@ -15,9 +15,7 @@ import (
 
 func Test_runDeleteCmd(t *testing.T) {
 	// Now add a temporary keybase
-	kbHome, cleanUp := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp)
-
+	kbHome := t.TempDir()
 	cmd := DeleteKeyCommand()
 	cmd.Flags().AddFlagSet(Commands(kbHome).PersistentFlags())
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)

client/keys/export_test.go

@@ -20,8 +20,7 @@ func Test_runExportCmd(t *testing.T) {
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)
 
 	// Now add a temporary keybase
-	kbHome, cleanUp := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp)
+	kbHome := t.TempDir()
 
 	// create a key
 	kb, err := keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, kbHome, mockIn)

client/keys/import_test.go

@@ -20,10 +20,9 @@ func Test_runImportCmd(t *testing.T) {
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)
 
 	// Now add a temporary keybase
-	kbHome, cleanUp := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp)
-
+	kbHome := t.TempDir()
 	kb, err := keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, kbHome, mockIn)
+
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		kb.Delete("keyname1") // nolint:errcheck

client/keys/list_test.go

@@ -18,11 +18,8 @@ func Test_runListCmd(t *testing.T) {
 	cmd := ListKeysCmd()
 	cmd.Flags().AddFlagSet(Commands("home").PersistentFlags())
 
-	kbHome1, cleanUp1 := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp1)
-
-	kbHome2, cleanUp2 := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp2)
+	kbHome1 := t.TempDir()
+	kbHome2 := t.TempDir()
 
 	mockIn := testutil.ApplyMockIODiscardOutErr(cmd)
 	kb, err := keyring.New(sdk.KeyringServiceName(), keyring.BackendTest, kbHome2, mockIn)

client/keys/migrate_test.go

@@ -18,11 +18,9 @@ func Test_runMigrateCmd(t *testing.T) {
 	_ = testutil.ApplyMockIODiscardOutErr(cmd)
 	cmd.Flags().AddFlagSet(Commands("home").PersistentFlags())
 
-	kbHome, kbCleanUp := testutil.NewTestCaseDir(t)
-	copy.Copy("testdata", kbHome)
-	assert.NotNil(t, kbHome)
-	t.Cleanup(kbCleanUp)
+	kbHome := t.TempDir()
 
+	copy.Copy("testdata", kbHome)
 	cmd.SetArgs([]string{
 		"keyname1",
 		fmt.Sprintf("--%s=%s", flags.FlagHome, kbHome),

client/keys/show_test.go

@@ -46,9 +46,7 @@ func Test_runShowCmd(t *testing.T) {
 	cmd.SetArgs([]string{"invalid1", "invalid2"})
 	require.EqualError(t, cmd.Execute(), "invalid1 is not a valid name or address: decoding bech32 failed: invalid index of 1")
 
-	kbHome, cleanUp := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanUp)
-
+	kbHome := t.TempDir()
 	fakeKeyName1 := "runShowCmd_Key1"
 	fakeKeyName2 := "runShowCmd_Key2"
 

client/tx/tx_test.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 
 	"github.com/stretchr/testify/require"
@@ -115,10 +114,9 @@ func TestBuildUnsignedTx(t *testing.T) {
 }
 
 func TestSign(t *testing.T) {
-	dir, clean := testutil.NewTestCaseDir(t)
-	t.Cleanup(clean)
-
+	dir := t.TempDir()
 	path := hd.CreateHDPath(118, 0, 0).String()
+
 	kr, err := keyring.New(t.Name(), "test", dir, nil)
 	require.NoError(t, err)
 

crypto/keyring/keyring_ledger_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/cosmos/cosmos-sdk/crypto/hd"
-	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -52,8 +51,8 @@ func TestInMemoryCreateLedger(t *testing.T) {
 // TestSignVerify does some detailed checks on how we sign and validate
 // signatures
 func TestSignVerifyKeyRingWithLedger(t *testing.T) {
-	dir, cleanup := testutil.NewTestCaseDir(t)
-	t.Cleanup(cleanup)
+	dir := t.TempDir()
+
 	kb, err := New("keybasename", "test", dir, nil)
 	require.NoError(t, err)
 
@@ -89,8 +88,7 @@ func TestSignVerifyKeyRingWithLedger(t *testing.T) {
 }
 
 func TestAltKeyring_SaveLedgerKey(t *testing.T) {
-	dir, clean := testutil.NewTestCaseDir(t)
-	t.Cleanup(clean)
+	dir := t.TempDir()
 
 	keyring, err := New(t.Name(), BackendTest, dir, nil)
 	require.NoError(t, err)