replace deprecated ioutil.TempDir with os.MkdirTemp
Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
3d22f4a86d
commit
cceba787fa
|
@ -23,11 +23,11 @@ const newTestPassword = "new-test-password"
|
||||||
|
|
||||||
func TestVerifyAccountPassword(t *testing.T) {
|
func TestVerifyAccountPassword(t *testing.T) {
|
||||||
accManager := NewGethManager()
|
accManager := NewGethManager()
|
||||||
keyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts")
|
keyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.RemoveAll(keyStoreDir) //nolint: errcheck
|
defer os.RemoveAll(keyStoreDir) //nolint: errcheck
|
||||||
|
|
||||||
emptyKeyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts_empty")
|
emptyKeyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts_empty")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.RemoveAll(emptyKeyStoreDir) //nolint: errcheck
|
defer os.RemoveAll(emptyKeyStoreDir) //nolint: errcheck
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ func TestVerifyAccountPassword(t *testing.T) {
|
||||||
// TestVerifyAccountPasswordWithAccountBeforeEIP55 verifies if VerifyAccountPassword
|
// TestVerifyAccountPasswordWithAccountBeforeEIP55 verifies if VerifyAccountPassword
|
||||||
// can handle accounts before introduction of EIP55.
|
// can handle accounts before introduction of EIP55.
|
||||||
func TestVerifyAccountPasswordWithAccountBeforeEIP55(t *testing.T) {
|
func TestVerifyAccountPasswordWithAccountBeforeEIP55(t *testing.T) {
|
||||||
keyStoreDir, err := ioutil.TempDir("", "status-accounts-test")
|
keyStoreDir, err := os.MkdirTemp("", "status-accounts-test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.RemoveAll(keyStoreDir) //nolint: errcheck
|
defer os.RemoveAll(keyStoreDir) //nolint: errcheck
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ type testAccount struct {
|
||||||
func (s *ManagerTestSuite) SetupTest() {
|
func (s *ManagerTestSuite) SetupTest() {
|
||||||
s.accManager = NewGethManager()
|
s.accManager = NewGethManager()
|
||||||
|
|
||||||
keyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts")
|
keyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
s.Require().NoError(s.accManager.InitKeystore(keyStoreDir))
|
s.Require().NoError(s.accManager.InitKeystore(keyStoreDir))
|
||||||
s.keydir = keyStoreDir
|
s.keydir = keyStoreDir
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package account
|
package account
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/accounts"
|
"github.com/ethereum/go-ethereum/accounts"
|
||||||
|
@ -16,7 +15,7 @@ import (
|
||||||
func makeAccountManager(keydir string) (manager *accounts.Manager, err error) {
|
func makeAccountManager(keydir string) (manager *accounts.Manager, err error) {
|
||||||
if keydir == "" {
|
if keydir == "" {
|
||||||
// There is no datadir.
|
// There is no datadir.
|
||||||
keydir, err = ioutil.TempDir("", "go-ethereum-keystore")
|
keydir, err = os.MkdirTemp("", "go-ethereum-keystore")
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -474,7 +474,7 @@ func TestLoginWithKey(t *testing.T) {
|
||||||
main := multiaccounts.Account{
|
main := multiaccounts.Account{
|
||||||
KeyUID: keyUID,
|
KeyUID: keyUID,
|
||||||
}
|
}
|
||||||
tmpdir, err := ioutil.TempDir("", "login-with-key-test-")
|
tmpdir, err := os.MkdirTemp("", "login-with-key-test-")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(tmpdir)
|
defer os.Remove(tmpdir)
|
||||||
conf, err := params.NewNodeConfig(tmpdir, 1777)
|
conf, err := params.NewNodeConfig(tmpdir, 1777)
|
||||||
|
@ -517,7 +517,7 @@ func TestVerifyDatabasePassword(t *testing.T) {
|
||||||
main := multiaccounts.Account{
|
main := multiaccounts.Account{
|
||||||
KeyUID: keyUID,
|
KeyUID: keyUID,
|
||||||
}
|
}
|
||||||
tmpdir, err := ioutil.TempDir("", "verify-database-password-")
|
tmpdir, err := os.MkdirTemp("", "verify-database-password-")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(tmpdir)
|
defer os.Remove(tmpdir)
|
||||||
conf, err := params.NewNodeConfig(tmpdir, 1777)
|
conf, err := params.NewNodeConfig(tmpdir, 1777)
|
||||||
|
@ -540,7 +540,7 @@ func TestVerifyDatabasePassword(t *testing.T) {
|
||||||
func TestDeleteMultiaccount(t *testing.T) {
|
func TestDeleteMultiaccount(t *testing.T) {
|
||||||
backend := NewGethStatusBackend()
|
backend := NewGethStatusBackend()
|
||||||
|
|
||||||
rootDataDir, err := ioutil.TempDir("", "test-keystore-dir")
|
rootDataDir, err := os.MkdirTemp("", "test-keystore-dir")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(rootDataDir)
|
defer os.Remove(rootDataDir)
|
||||||
|
|
||||||
|
@ -616,7 +616,7 @@ func TestDeleteMultiaccount(t *testing.T) {
|
||||||
func TestConvertAccount(t *testing.T) {
|
func TestConvertAccount(t *testing.T) {
|
||||||
backend := NewGethStatusBackend()
|
backend := NewGethStatusBackend()
|
||||||
password := "123123"
|
password := "123123"
|
||||||
rootDataDir, err := ioutil.TempDir("", "test-keystore-dir")
|
rootDataDir, err := os.MkdirTemp("", "test-keystore-dir")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(rootDataDir)
|
defer os.Remove(rootDataDir)
|
||||||
|
|
||||||
|
@ -812,7 +812,7 @@ func TestLoginAndMigrationsStillWorkWithExistingUsers(t *testing.T) {
|
||||||
|
|
||||||
srcFolder := "../static/test-0.97.3-account/"
|
srcFolder := "../static/test-0.97.3-account/"
|
||||||
|
|
||||||
tmpdir, err := ioutil.TempDir("", "login-and-migrations-with-existing-users")
|
tmpdir, err := os.MkdirTemp("", "login-and-migrations-with-existing-users")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(tmpdir)
|
defer os.Remove(tmpdir)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@ package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -16,7 +15,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func setupWalletTest(t *testing.T, password string) (backend *GethStatusBackend, defersFunc func(), err error) {
|
func setupWalletTest(t *testing.T, password string) (backend *GethStatusBackend, defersFunc func(), err error) {
|
||||||
tmpdir, err := ioutil.TempDir("", "verified-account-test-")
|
tmpdir, err := os.MkdirTemp("", "verified-account-test-")
|
||||||
|
|
||||||
defers := make([]func(), 0)
|
defers := make([]func(), 0)
|
||||||
defersFunc = func() {
|
defersFunc = func() {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package mailserver
|
package mailserver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
@ -16,7 +15,7 @@ import (
|
||||||
func TestLevelDB_BuildIteratorWithTopic(t *testing.T) {
|
func TestLevelDB_BuildIteratorWithTopic(t *testing.T) {
|
||||||
topic := []byte{0x01, 0x02, 0x03, 0x04}
|
topic := []byte{0x01, 0x02, 0x03, 0x04}
|
||||||
|
|
||||||
dir, err := ioutil.TempDir("/tmp", "status-go-test-level-db")
|
dir, err := os.MkdirTemp("/tmp", "status-go-test-level-db")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
db, err := NewLevelDB(dir)
|
db, err := NewLevelDB(dir)
|
||||||
|
|
|
@ -21,7 +21,6 @@ import (
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
@ -70,7 +69,7 @@ func (s *MailserverSuite) SetupTest() {
|
||||||
s.shh = waku.New(&waku.DefaultConfig, nil)
|
s.shh = waku.New(&waku.DefaultConfig, nil)
|
||||||
s.shh.RegisterMailServer(s.server)
|
s.shh.RegisterMailServer(s.server)
|
||||||
|
|
||||||
tmpDir, err := ioutil.TempDir("", "mailserver-test")
|
tmpDir, err := os.MkdirTemp("", "mailserver-test")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
s.dataDir = tmpDir
|
s.dataDir = tmpDir
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package node
|
package node
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"math"
|
"math"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
|
@ -59,7 +58,7 @@ func TestStatusNodeStart(t *testing.T) {
|
||||||
func TestStatusNodeWithDataDir(t *testing.T) {
|
func TestStatusNodeWithDataDir(t *testing.T) {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
dir, err := ioutil.TempDir("", "status-node-test")
|
dir, err := os.MkdirTemp("", "status-node-test")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer func() {
|
defer func() {
|
||||||
require.NoError(t, os.RemoveAll(dir))
|
require.NoError(t, os.RemoveAll(dir))
|
||||||
|
|
|
@ -55,7 +55,7 @@ func TestNewNodeConfigWithDefaults(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestNewConfigFromJSON(t *testing.T) {
|
func TestNewConfigFromJSON(t *testing.T) {
|
||||||
tmpDir, err := ioutil.TempDir(os.TempDir(), "geth-config-tests")
|
tmpDir, err := os.MkdirTemp(os.TempDir(), "geth-config-tests")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ func TestNewConfigFromJSON(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConfigWriteRead(t *testing.T) {
|
func TestConfigWriteRead(t *testing.T) {
|
||||||
tmpDir, err := ioutil.TempDir(os.TempDir(), "geth-config-tests")
|
tmpDir, err := os.MkdirTemp(os.TempDir(), "geth-config-tests")
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
defer os.RemoveAll(tmpDir) // nolint: errcheck
|
defer os.RemoveAll(tmpDir) // nolint: errcheck
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package profiling
|
package profiling
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -11,7 +10,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestProfilingCPU(t *testing.T) {
|
func TestProfilingCPU(t *testing.T) {
|
||||||
dir, err := ioutil.TempDir("", "profiling")
|
dir, err := os.MkdirTemp("", "profiling")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
err = StartCPUProfile(dir)
|
err = StartCPUProfile(dir)
|
||||||
|
@ -39,7 +38,7 @@ func TestProfilingCPU(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestProfilingMem(t *testing.T) {
|
func TestProfilingMem(t *testing.T) {
|
||||||
dir, err := ioutil.TempDir("", "profiling")
|
dir, err := os.MkdirTemp("", "profiling")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
err = WriteHeapFile(dir)
|
err = WriteHeapFile(dir)
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package common
|
package common
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -54,7 +53,7 @@ func (s *MessageSenderSuite) SetupTest() {
|
||||||
s.logger, err = zap.NewDevelopment()
|
s.logger, err = zap.NewDevelopment()
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
|
|
||||||
s.tmpDir, err = ioutil.TempDir("", "")
|
s.tmpDir, err = os.MkdirTemp("", "")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
|
|
||||||
identity, err := crypto.GenerateKey()
|
identity, err := crypto.GenerateKey()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package encryption
|
package encryption
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ type SQLLitePersistenceKeysStorageTestSuite struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SQLLitePersistenceKeysStorageTestSuite) SetupTest() {
|
func (s *SQLLitePersistenceKeysStorageTestSuite) SetupTest() {
|
||||||
dir, err := ioutil.TempDir("", "keys-storage-persistence")
|
dir, err := os.MkdirTemp("", "keys-storage-persistence")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
|
|
||||||
key := "blahblahblah"
|
key := "blahblahblah"
|
||||||
|
|
|
@ -2,7 +2,7 @@ package encryption
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"io/ioutil"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ type SQLLitePersistenceTestSuite struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *SQLLitePersistenceTestSuite) SetupTest() {
|
func (s *SQLLitePersistenceTestSuite) SetupTest() {
|
||||||
dir, err := ioutil.TempDir("", "sqlite-persistence")
|
dir, err := os.MkdirTemp("", "sqlite-persistence")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
|
|
||||||
db, err := sqlite.Open(filepath.Join(dir, "db.sql"), "test-key", sqlite.ReducedKDFIterationsNumber)
|
db, err := sqlite.Open(filepath.Join(dir, "db.sql"), "test-key", sqlite.ReducedKDFIterationsNumber)
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package sqlite
|
package sqlite
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -10,7 +9,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestOpen(t *testing.T) {
|
func TestOpen(t *testing.T) {
|
||||||
dir, err := ioutil.TempDir("", "test-open")
|
dir, err := os.MkdirTemp("", "test-open")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
defer os.Remove(dir)
|
defer os.Remove(dir)
|
||||||
|
|
||||||
|
|
|
@ -62,10 +62,10 @@ func setupTestDB(t *testing.T) (*multiaccounts.Database, func()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func makeKeystores(t *testing.T) (string, string, func()) {
|
func makeKeystores(t *testing.T) (string, string, func()) {
|
||||||
keyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts")
|
keyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
emptyKeyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts_empty")
|
emptyKeyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts_empty")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
keyStoreDir = filepath.Join(keyStoreDir, "keystore", keyUID)
|
keyStoreDir = filepath.Join(keyStoreDir, "keystore", keyUID)
|
||||||
|
|
|
@ -34,7 +34,7 @@ func createDB(t *testing.T) (*sql.DB, func()) {
|
||||||
func setupTestAPI(t *testing.T) (*API, func()) {
|
func setupTestAPI(t *testing.T) (*API, func()) {
|
||||||
db, cancel := createDB(t)
|
db, cancel := createDB(t)
|
||||||
|
|
||||||
keyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts")
|
keyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Creating a dummy status node to simulate what it's done in get_status_node.go
|
// Creating a dummy status node to simulate what it's done in get_status_node.go
|
||||||
|
|
|
@ -102,7 +102,7 @@ func TestRequestMessagesErrors(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestInitProtocol(t *testing.T) {
|
func TestInitProtocol(t *testing.T) {
|
||||||
directory, err := ioutil.TempDir("", "status-go-testing")
|
directory, err := os.MkdirTemp("", "status-go-testing")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
config := params.NodeConfig{
|
config := params.NodeConfig{
|
||||||
|
@ -124,7 +124,7 @@ func TestInitProtocol(t *testing.T) {
|
||||||
nodeWrapper := ext.NewTestNodeWrapper(nil, waku)
|
nodeWrapper := ext.NewTestNodeWrapper(nil, waku)
|
||||||
service := New(config, nodeWrapper, nil, nil, db)
|
service := New(config, nodeWrapper, nil, nil, db)
|
||||||
|
|
||||||
tmpdir, err := ioutil.TempDir("", "test-shhext-service-init-protocol")
|
tmpdir, err := os.MkdirTemp("", "test-shhext-service-init-protocol")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
sqlDB, err := appdatabase.InitializeDB(fmt.Sprintf("%s/db.sql", tmpdir), "password", sqlite.ReducedKDFIterationsNumber)
|
sqlDB, err := appdatabase.InitializeDB(fmt.Sprintf("%s/db.sql", tmpdir), "password", sqlite.ReducedKDFIterationsNumber)
|
||||||
|
@ -223,7 +223,7 @@ func (s *ShhExtSuite) createAndAddNode() {
|
||||||
|
|
||||||
func (s *ShhExtSuite) SetupTest() {
|
func (s *ShhExtSuite) SetupTest() {
|
||||||
var err error
|
var err error
|
||||||
s.dir, err = ioutil.TempDir("", "status-go-testing")
|
s.dir, err = os.MkdirTemp("", "status-go-testing")
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ func createDB(t *testing.T) (*sql.DB, func()) {
|
||||||
func setupTestAPI(t *testing.T) (*API, func()) {
|
func setupTestAPI(t *testing.T) (*API, func()) {
|
||||||
db, cancel := createDB(t)
|
db, cancel := createDB(t)
|
||||||
|
|
||||||
keyStoreDir, err := ioutil.TempDir(os.TempDir(), "accounts")
|
keyStoreDir, err := os.MkdirTemp(os.TempDir(), "accounts")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// Creating a dummy status node to simulate what it's done in get_status_node.go
|
// Creating a dummy status node to simulate what it's done in get_status_node.go
|
||||||
|
|
Loading…
Reference in New Issue