WIP on fixing tests
This commit is contained in:
parent
d563248bbb
commit
38d44e839e
|
@ -1,6 +1,7 @@
|
|||
package keeper
|
||||
|
||||
import (
|
||||
proto "github.com/gogo/protobuf/types"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
@ -45,7 +46,8 @@ func TestProposalQueues(t *testing.T) {
|
|||
|
||||
activeIterator := keeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
|
||||
require.True(t, activeIterator.Valid())
|
||||
keeper.cdc.UnmarshalBinaryLengthPrefixed(activeIterator.Value(), &proposalID)
|
||||
require.Equal(t, proposalID, proposal.ProposalID)
|
||||
var proposalIdWrapper proto.UInt64Value
|
||||
keeper.cdc.UnmarshalBinaryLengthPrefixed(activeIterator.Value(), &proposalIdWrapper)
|
||||
require.Equal(t, proposalIdWrapper.Value, proposal.ProposalID)
|
||||
activeIterator.Close()
|
||||
}
|
||||
|
|
|
@ -99,7 +99,9 @@ func registerTestCodec(cdc *codec.Codec) {
|
|||
func TestSubmitProposal(t *testing.T) {
|
||||
ctx, _, _, keeper, _, _ := createTestInput(t, false, 100) // nolint: dogsled
|
||||
|
||||
registerTestCodec(keeper.cdc)
|
||||
cdc := codec.New()
|
||||
|
||||
registerTestCodec(cdc)
|
||||
|
||||
testCases := []struct {
|
||||
content types.Content
|
||||
|
|
|
@ -16,7 +16,7 @@ import (
|
|||
|
||||
const custom = "custom"
|
||||
|
||||
func getQueriedParams(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier) (types.DepositParams, types.VotingParams, types.TallyParams) {
|
||||
func getQueriedParams(t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier) (types.DepositParams, types.VotingParams, types.TallyParams) {
|
||||
query := abci.RequestQuery{
|
||||
Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryParams, types.ParamDeposit}, "/"),
|
||||
Data: []byte{},
|
||||
|
@ -57,7 +57,7 @@ func getQueriedParams(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier s
|
|||
}
|
||||
|
||||
func getQueriedProposals(
|
||||
t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier,
|
||||
t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier,
|
||||
depositor, voter sdk.AccAddress, status types.ProposalStatus, page, limit int,
|
||||
) []types.Proposal {
|
||||
|
||||
|
@ -76,7 +76,7 @@ func getQueriedProposals(
|
|||
return proposals
|
||||
}
|
||||
|
||||
func getQueriedDeposit(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier, proposalID uint64, depositor sdk.AccAddress) types.Deposit {
|
||||
func getQueriedDeposit(t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier, proposalID uint64, depositor sdk.AccAddress) types.Deposit {
|
||||
query := abci.RequestQuery{
|
||||
Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryDeposit}, "/"),
|
||||
Data: cdc.MustMarshalJSON(types.NewQueryDepositParams(proposalID, depositor)),
|
||||
|
@ -92,7 +92,7 @@ func getQueriedDeposit(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier
|
|||
return deposit
|
||||
}
|
||||
|
||||
func getQueriedDeposits(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier, proposalID uint64) []types.Deposit {
|
||||
func getQueriedDeposits(t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier, proposalID uint64) []types.Deposit {
|
||||
query := abci.RequestQuery{
|
||||
Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryDeposits}, "/"),
|
||||
Data: cdc.MustMarshalJSON(types.NewQueryProposalParams(proposalID)),
|
||||
|
@ -108,7 +108,7 @@ func getQueriedDeposits(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier
|
|||
return deposits
|
||||
}
|
||||
|
||||
func getQueriedVote(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier, proposalID uint64, voter sdk.AccAddress) types.Vote {
|
||||
func getQueriedVote(t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier, proposalID uint64, voter sdk.AccAddress) types.Vote {
|
||||
query := abci.RequestQuery{
|
||||
Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryVote}, "/"),
|
||||
Data: cdc.MustMarshalJSON(types.NewQueryVoteParams(proposalID, voter)),
|
||||
|
@ -124,7 +124,7 @@ func getQueriedVote(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk
|
|||
return vote
|
||||
}
|
||||
|
||||
func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc *codec.Codec, querier sdk.Querier,
|
||||
func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc codec.Marshaler, querier sdk.Querier,
|
||||
proposalID uint64, page, limit int) []types.Vote {
|
||||
query := abci.RequestQuery{
|
||||
Path: strings.Join([]string{custom, types.QuerierRoute, types.QueryVote}, "/"),
|
||||
|
|
Loading…
Reference in New Issue