certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update handler

This commit is contained in:
Aleksandr Bezobchuk 2020-03-02 16:06:35 -05:00
parent fb42f8b2a0
commit fe7b02231e
No known key found for this signature in database
GPG Key ID: 7DAC30FBD99879B0
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x/gov/abci_test.go
View File

@ -8,6 +8,7 @@ import (
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
"github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/simapp"
simappcodec "github.com/cosmos/cosmos-sdk/simapp/codec"
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/gov"
"github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking"
@ -27,11 +28,12 @@ func TestTickExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg := gov.NewMsgSubmitProposal( newProposalMsg, err := simappcodec.NewMsgSubmitProposal(
gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
) )
require.NoError(t, err)
res, err := govHandler(ctx, newProposalMsg) res, err := govHandler(ctx, newProposalMsg)
require.NoError(t, err) require.NoError(t, err)
@ -78,11 +80,12 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg := gov.NewMsgSubmitProposal( newProposalMsg, err := simappcodec.NewMsgSubmitProposal(
gov.ContentFromProposalType("test", "test", gov.ProposalTypeText), gov.ContentFromProposalType("test", "test", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
) )
require.NoError(t, err)
res, err := govHandler(ctx, newProposalMsg) res, err := govHandler(ctx, newProposalMsg)
require.NoError(t, err) require.NoError(t, err)
@ -100,11 +103,12 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) {
require.False(t, inactiveQueue.Valid()) require.False(t, inactiveQueue.Valid())
inactiveQueue.Close() inactiveQueue.Close()
newProposalMsg2 := gov.NewMsgSubmitProposal( newProposalMsg2, err := simappcodec.NewMsgSubmitProposal(
gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
) )
require.NoError(t, err)
res, err = govHandler(ctx, newProposalMsg2) res, err = govHandler(ctx, newProposalMsg2)
require.NoError(t, err) require.NoError(t, err)
@ -156,11 +160,12 @@ func TestTickPassedDepositPeriod(t *testing.T) {
require.False(t, activeQueue.Valid()) require.False(t, activeQueue.Valid())
activeQueue.Close() activeQueue.Close()
newProposalMsg := gov.NewMsgSubmitProposal( newProposalMsg, err := simappcodec.NewMsgSubmitProposal(
gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText), gov.ContentFromProposalType("test2", "test2", gov.ProposalTypeText),
sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)}, sdk.Coins{sdk.NewInt64Coin(sdk.DefaultBondDenom, 5)},
addrs[0], addrs[0],
) )
require.NoError(t, err)
res, err := govHandler(ctx, newProposalMsg) res, err := govHandler(ctx, newProposalMsg)
require.NoError(t, err) require.NoError(t, err)
@ -211,7 +216,8 @@ func TestTickPassedVotingPeriod(t *testing.T) {
activeQueue.Close() activeQueue.Close()
proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))} proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5))}
newProposalMsg := gov.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0]) newProposalMsg, err := simappcodec.NewMsgSubmitProposal(TestProposal, proposalCoins, addrs[0])
require.NoError(t, err)
res, err := govHandler(ctx, newProposalMsg) res, err := govHandler(ctx, newProposalMsg)
require.NoError(t, err) require.NoError(t, err)

8
x/gov/handler.go
View File

@ -30,12 +30,12 @@ func NewHandler(keeper Keeper) sdk.Handler {
} }
func handleMsgSubmitProposal(ctx sdk.Context, keeper Keeper, msg MsgSubmitProposal) (*sdk.Result, error) { func handleMsgSubmitProposal(ctx sdk.Context, keeper Keeper, msg MsgSubmitProposal) (*sdk.Result, error) {
proposal, err := keeper.SubmitProposal(ctx, msg.Content) proposal, err := keeper.SubmitProposal(ctx, msg.GetContent())
if err != nil { if err != nil {
return nil, err return nil, err
} }
votingStarted, err := keeper.AddDeposit(ctx, proposal.ProposalID, msg.Proposer, msg.InitialDeposit) votingStarted, err := keeper.AddDeposit(ctx, proposal.ProposalID, msg.GetProposer(), msg.GetInitialDeposit())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -44,11 +44,11 @@ func handleMsgSubmitProposal(ctx sdk.Context, keeper Keeper, msg MsgSubmitPropos
sdk.NewEvent( sdk.NewEvent(
sdk.EventTypeMessage, sdk.EventTypeMessage,
sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
sdk.NewAttribute(sdk.AttributeKeySender, msg.Proposer.String()), sdk.NewAttribute(sdk.AttributeKeySender, msg.GetProposer().String()),
), ),
) )
submitEvent := sdk.NewEvent(types.EventTypeSubmitProposal, sdk.NewAttribute(types.AttributeKeyProposalType, msg.Content.ProposalType())) submitEvent := sdk.NewEvent(types.EventTypeSubmitProposal, sdk.NewAttribute(types.AttributeKeyProposalType, msg.GetContent().ProposalType()))
if votingStarted { if votingStarted {
submitEvent = submitEvent.AppendAttributes( submitEvent = submitEvent.AppendAttributes(
sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", proposal.ProposalID)), sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", proposal.ProposalID)),