40a92a2aec
## Description The `io/ioutil` package has been deprecated in Go 1.16 (See https://golang.org/doc/go1.16#ioutil). Since cosmos-sdk has upgraded to Go 1.17 (#9987), this PR replaces the existing `io/ioutil` functions with their new definitions in `io` and `os` packages. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [x] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [x] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [x] reviewed "Files changed" and left comments if necessary - [x] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
68 lines
1.9 KiB
Go
68 lines
1.9 KiB
Go
package genutil_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/gogo/protobuf/proto"
|
|
|
|
tmtypes "github.com/tendermint/tendermint/types"
|
|
|
|
"github.com/cosmos/cosmos-sdk/codec"
|
|
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
|
|
"github.com/cosmos/cosmos-sdk/server"
|
|
"github.com/cosmos/cosmos-sdk/types"
|
|
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
|
"github.com/cosmos/cosmos-sdk/x/genutil"
|
|
gtypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
|
|
)
|
|
|
|
type doNothingUnmarshalJSON struct {
|
|
codec.JSONCodec
|
|
}
|
|
|
|
func (dnj *doNothingUnmarshalJSON) UnmarshalJSON(_ []byte, _ proto.Message) error {
|
|
return nil
|
|
}
|
|
|
|
type doNothingIterator struct {
|
|
gtypes.GenesisBalancesIterator
|
|
}
|
|
|
|
func (dni *doNothingIterator) IterateGenesisBalances(_ codec.JSONCodec, _ map[string]json.RawMessage, _ func(bankexported.GenesisBalance) bool) {
|
|
}
|
|
|
|
// Ensures that CollectTx correctly traverses directories and won't error out on encountering
|
|
// a directory during traversal of the first level. See issue https://github.com/cosmos/cosmos-sdk/issues/6788.
|
|
func TestCollectTxsHandlesDirectories(t *testing.T) {
|
|
testDir, err := os.MkdirTemp(os.TempDir(), "testCollectTxs")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(testDir)
|
|
|
|
// 1. We'll insert a directory as the first element before JSON file.
|
|
subDirPath := filepath.Join(testDir, "_adir")
|
|
if err := os.MkdirAll(subDirPath, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
txDecoder := types.TxDecoder(func(txBytes []byte) (types.Tx, error) {
|
|
return nil, nil
|
|
})
|
|
|
|
// 2. Ensure that we don't encounter any error traversing the directory.
|
|
srvCtx := server.NewDefaultContext()
|
|
_ = srvCtx
|
|
cdc := codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
|
|
gdoc := tmtypes.GenesisDoc{AppState: []byte("{}")}
|
|
balItr := new(doNothingIterator)
|
|
|
|
dnc := &doNothingUnmarshalJSON{cdc}
|
|
if _, _, err := genutil.CollectTxs(dnc, txDecoder, "foo", testDir, gdoc, balItr); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|