diff --git a/cmd/kaspawallet/broadcast.go b/cmd/kaspawallet/broadcast.go index c25a580f5..90dc39e0f 100644 --- a/cmd/kaspawallet/broadcast.go +++ b/cmd/kaspawallet/broadcast.go @@ -3,7 +3,7 @@ package main import ( "context" "fmt" - "io/ioutil" + "os" "strings" "github.com/kaspanet/kaspad/cmd/kaspawallet/daemon/client" @@ -30,7 +30,7 @@ func broadcast(conf *broadcastConfig) error { transactionsHex := conf.Transactions if conf.TransactionsFile != "" { - transactionHexBytes, err := ioutil.ReadFile(conf.TransactionsFile) + transactionHexBytes, err := os.ReadFile(conf.TransactionsFile) if err != nil { return errors.Wrapf(err, "Could not read hex from %s", conf.TransactionsFile) } diff --git a/cmd/kaspawallet/parse.go b/cmd/kaspawallet/parse.go index 0e278e90f..68ddad664 100644 --- a/cmd/kaspawallet/parse.go +++ b/cmd/kaspawallet/parse.go @@ -3,13 +3,14 @@ package main import ( "encoding/hex" "fmt" + "os" + "strings" + "github.com/kaspanet/kaspad/cmd/kaspawallet/libkaspawallet/serialization" "github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing" "github.com/kaspanet/kaspad/domain/consensus/utils/constants" "github.com/kaspanet/kaspad/domain/consensus/utils/txscript" "github.com/pkg/errors" - "io/ioutil" - "strings" ) func parse(conf *parseConfig) error { @@ -22,7 +23,7 @@ func parse(conf *parseConfig) error { transactionHex := conf.Transaction if conf.TransactionFile != "" { - transactionHexBytes, err := ioutil.ReadFile(conf.TransactionFile) + transactionHexBytes, err := os.ReadFile(conf.TransactionFile) if err != nil { return errors.Wrapf(err, "Could not read hex from %s", conf.TransactionFile) } diff --git a/cmd/kaspawallet/sign.go b/cmd/kaspawallet/sign.go index c91f7043c..f21de2d39 100644 --- a/cmd/kaspawallet/sign.go +++ b/cmd/kaspawallet/sign.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "io/ioutil" "os" "strings" @@ -34,7 +33,7 @@ func sign(conf *signConfig) error { transactionsHex := conf.Transaction if conf.TransactionFile != "" { - transactionHexBytes, err := ioutil.ReadFile(conf.TransactionFile) + transactionHexBytes, err := os.ReadFile(conf.TransactionFile) if err != nil { return errors.Wrapf(err, "Could not read hex from %s", conf.TransactionFile) } diff --git a/domain/consensus/factory.go b/domain/consensus/factory.go index 8d1efef47..1bbd9470a 100644 --- a/domain/consensus/factory.go +++ b/domain/consensus/factory.go @@ -1,7 +1,6 @@ package consensus import ( - "io/ioutil" "os" "sync" @@ -569,7 +568,7 @@ func (f *factory) NewTestConsensus(config *Config, testName string) ( tc testapi.TestConsensus, teardown func(keepDataDir bool), err error) { datadir := f.dataDir if datadir == "" { - datadir, err = ioutil.TempDir("", testName) + datadir, err = os.MkdirTemp("", testName) if err != nil { return nil, nil, err } diff --git a/domain/consensus/factory_test.go b/domain/consensus/factory_test.go index b5bca1394..840607011 100644 --- a/domain/consensus/factory_test.go +++ b/domain/consensus/factory_test.go @@ -1,7 +1,7 @@ package consensus import ( - "io/ioutil" + "os" "testing" "github.com/kaspanet/kaspad/domain/prefixmanager/prefix" @@ -15,7 +15,7 @@ func TestNewConsensus(t *testing.T) { config := &Config{Params: dagconfig.DevnetParams} - tmpDir, err := ioutil.TempDir("", "TestNewConsensus") + tmpDir, err := os.MkdirTemp("", "TestNewConsensus") if err != nil { return } diff --git a/domain/consensus/test_consensus_render_to_dot.go b/domain/consensus/test_consensus_render_to_dot.go index e2320bff0..bb777006e 100644 --- a/domain/consensus/test_consensus_render_to_dot.go +++ b/domain/consensus/test_consensus_render_to_dot.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" "io" - "io/ioutil" + "os" "os/exec" "strings" @@ -79,5 +79,5 @@ func renderDotScript(dotScript string, filename string) error { return fmt.Errorf("Error getting output of dot: %s\nstderr:\n%s", err, stderr.String()) } - return ioutil.WriteFile(filename, svg, 0600) + return os.WriteFile(filename, svg, 0600) } diff --git a/domain/consensus/utils/txscript/reference_test.go b/domain/consensus/utils/txscript/reference_test.go index 2dc9883bc..e33115cae 100644 --- a/domain/consensus/utils/txscript/reference_test.go +++ b/domain/consensus/utils/txscript/reference_test.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "encoding/json" "fmt" - "io/ioutil" + "os" "strconv" "strings" "testing" @@ -380,7 +380,7 @@ func testScripts(t *testing.T, tests [][]interface{}, useSigCache bool) { // TestScripts ensures all of the tests in script_tests.json execute with the // expected results as defined in the test data. func TestScripts(t *testing.T) { - file, err := ioutil.ReadFile("data/script_tests.json") + file, err := os.ReadFile("data/script_tests.json") if err != nil { t.Fatalf("TestScripts: %v\n", err) } diff --git a/domain/domain_test.go b/domain/domain_test.go index ad7489349..f8757f386 100644 --- a/domain/domain_test.go +++ b/domain/domain_test.go @@ -4,6 +4,10 @@ import ( "fmt" "math/big" + "os" + "strings" + "testing" + "github.com/kaspanet/kaspad/domain" "github.com/kaspanet/kaspad/domain/consensus" "github.com/kaspanet/kaspad/domain/consensus/model" @@ -12,17 +16,13 @@ import ( "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" "github.com/kaspanet/kaspad/domain/miningmanager/mempool" "github.com/kaspanet/kaspad/infrastructure/db/database/ldb" - "io/ioutil" - "os" - "strings" - "testing" ) func TestCreateStagingConsensus(t *testing.T) { testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) { - dataDir, err := ioutil.TempDir("", fmt.Sprintf("TestCreateStagingConsensus-%s", consensusConfig.Name)) + dataDir, err := os.MkdirTemp("", fmt.Sprintf("TestCreateStagingConsensus-%s", consensusConfig.Name)) if err != nil { - t.Fatalf("ioutil.TempDir: %+v", err) + t.Fatalf("os.MkdirTemp: %+v", err) } defer os.RemoveAll(dataDir) diff --git a/infrastructure/config/config_test.go b/infrastructure/config/config_test.go index fd205b351..86bcf8ccd 100644 --- a/infrastructure/config/config_test.go +++ b/infrastructure/config/config_test.go @@ -1,7 +1,6 @@ package config import ( - "io/ioutil" "os" "path/filepath" "runtime" @@ -21,14 +20,14 @@ func TestCreateDefaultConfigFile(t *testing.T) { sampleConfigFile := filepath.Join(filepath.Dir(path), "sample-kaspad.conf") // Setup a temporary directory - tmpDir, err := ioutil.TempDir("", "kaspad") + tmpDir, err := os.MkdirTemp("", "kaspad") if err != nil { t.Fatalf("Failed creating a temporary directory: %v", err) } testpath := filepath.Join(tmpDir, "test.conf") // copy config file to location of kaspad binary - data, err := ioutil.ReadFile(sampleConfigFile) + data, err := os.ReadFile(sampleConfigFile) if err != nil { t.Fatalf("Failed reading sample config file: %v", err) } @@ -37,7 +36,7 @@ func TestCreateDefaultConfigFile(t *testing.T) { t.Fatalf("Failed obtaining app path: %v", err) } tmpConfigFile := filepath.Join(appPath, "sample-kaspad.conf") - err = ioutil.WriteFile(tmpConfigFile, data, 0644) + err = os.WriteFile(tmpConfigFile, data, 0644) if err != nil { t.Fatalf("Failed copying sample config file: %v", err) } diff --git a/infrastructure/db/database/common_test.go b/infrastructure/db/database/common_test.go index 82c9e538d..2dd91337c 100644 --- a/infrastructure/db/database/common_test.go +++ b/infrastructure/db/database/common_test.go @@ -2,7 +2,7 @@ package database_test import ( "fmt" - "io/ioutil" + "os" "testing" "github.com/kaspanet/kaspad/infrastructure/db/database" @@ -20,7 +20,7 @@ var databasePrepareFuncs = []databasePrepareFunc{ func prepareLDBForTest(t *testing.T, testName string) (db database.Database, name string, teardownFunc func()) { // Create a temp db to run tests against - path, err := ioutil.TempDir("", testName) + path, err := os.MkdirTemp("", testName) if err != nil { t.Fatalf("%s: TempDir unexpectedly "+ "failed: %s", testName, err) diff --git a/infrastructure/db/database/ldb/leveldb_test.go b/infrastructure/db/database/ldb/leveldb_test.go index 7920e0909..48f768a19 100644 --- a/infrastructure/db/database/ldb/leveldb_test.go +++ b/infrastructure/db/database/ldb/leveldb_test.go @@ -1,7 +1,7 @@ package ldb import ( - "io/ioutil" + "os" "reflect" "testing" @@ -10,7 +10,7 @@ import ( func prepareDatabaseForTest(t *testing.T, testName string) (ldb *LevelDB, teardownFunc func()) { // Create a temp db to run tests against - path, err := ioutil.TempDir("", testName) + path, err := os.MkdirTemp("", testName) if err != nil { t.Fatalf("%s: TempDir unexpectedly "+ "failed: %s", testName, err) diff --git a/stability-tests/common/tempdir.go b/stability-tests/common/tempdir.go index 50266dd6e..aa0f47271 100644 --- a/stability-tests/common/tempdir.go +++ b/stability-tests/common/tempdir.go @@ -1,9 +1,9 @@ package common -import "io/ioutil" +import "os" // TempDir returns a temporary directory with the given pattern, prefixed with STABILITY_TEMP_DIR_ func TempDir(pattern string) (string, error) { const prefix = "STABILITY_TEMP_DIR_" - return ioutil.TempDir("", prefix+pattern) + return os.MkdirTemp("", prefix+pattern) } diff --git a/stability-tests/netsync/fast-pruning-ibd-test/generate_test.go b/stability-tests/netsync/fast-pruning-ibd-test/generate_test.go index 2c631f5bc..18dd99a69 100644 --- a/stability-tests/netsync/fast-pruning-ibd-test/generate_test.go +++ b/stability-tests/netsync/fast-pruning-ibd-test/generate_test.go @@ -1,15 +1,15 @@ package fast_pruning_ibd_test import ( - "github.com/kaspanet/kaspad/domain/consensus" - "github.com/kaspanet/kaspad/domain/consensus/model/externalapi" - "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" - "github.com/kaspanet/kaspad/domain/dagconfig" - "io/ioutil" "os" "path" "testing" "time" + + "github.com/kaspanet/kaspad/domain/consensus" + "github.com/kaspanet/kaspad/domain/consensus/model/externalapi" + "github.com/kaspanet/kaspad/domain/consensus/utils/testutils" + "github.com/kaspanet/kaspad/domain/dagconfig" ) // TestGenerateFastPruningIBDTest generates the json needed for dag-for-fast-pruning-ibd-test.json.gz @@ -130,7 +130,7 @@ func TestGenerateFastPruningIBDTest(t *testing.T) { } } - file, err := ioutil.TempFile("", "") + file, err := os.CreateTemp("", "") if err != nil { t.Fatal(err) } diff --git a/testing/integration/config_test.go b/testing/integration/config_test.go index 6a975bd33..2e494722b 100644 --- a/testing/integration/config_test.go +++ b/testing/integration/config_test.go @@ -1,7 +1,7 @@ package integration import ( - "io/ioutil" + "os" "testing" "time" @@ -63,7 +63,7 @@ func commonConfig() *config.Config { } func randomDirectory(t *testing.T) string { - dir, err := ioutil.TempDir("", "integration-test") + dir, err := os.MkdirTemp("", "integration-test") if err != nil { t.Fatalf("Error creating temporary directory for test: %+v", err) }