Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: add title, summary and proposer to proposal struct of gov #14390

Merged
merged 13 commits into from
Dec 26, 2022
Merged

refactor: add title, summary and proposer to proposal struct of gov #14390

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4dccb77
add title, summary and proposer to proposal struct
tac0turtle Dec 22, 2022
bf4b31a
Merge branch 'main' into marko/addgov
tac0turtle Dec 23, 2022
6eafefe
fix migration
tac0turtle Dec 23, 2022
ca10c2d
fix integration tests
tac0turtle Dec 23, 2022
22422dd
Merge branch 'main' into marko/addgov
tac0turtle Dec 24, 2022
9e824e8
clean up
tac0turtle Dec 24, 2022
90ee27d
fix tests and add in metadata summary and title to proposal
tac0turtle Dec 24, 2022
77fbc20
address comments
tac0turtle Dec 26, 2022
cbd03b8
changelog entry
tac0turtle Dec 26, 2022
fc93b4f
remove extra checks
tac0turtle Dec 26, 2022
8590ae6
fix tests and comments.
julienrbrt Dec 26, 2022
10302e6
Merge branch 'main' into marko/addgov
julienrbrt Dec 26, 2022
db7f26d
fix padding in cli
julienrbrt Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
447 changes: 336 additions & 111 deletions api/cosmos/gov/v1/gov.pulsar.go
View file
Open in desktop

Large diffs are not rendered by default.

153 changes: 151 additions & 2 deletions api/cosmos/gov/v1/tx.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions proto/cosmos/gov/v1/gov.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ message Proposal {

// metadata is any arbitrary metadata attached to the proposal.
string metadata = 10;

// title is the title of the proposal
string title = 11;

// summary is a short summary of the proposal
string summary = 12;

string proposer = 13 [(cosmos_proto.scalar) = "cosmos.AddressString"];
tac0turtle marked this conversation as resolved.
Show resolved Hide resolved
}

// ProposalStatus enumerates the valid statuses of a proposal.
Expand Down
6 changes: 6 additions & 0 deletions proto/cosmos/gov/v1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ message MsgSubmitProposal {

// metadata is any arbitrary metadata attached to the proposal.
string metadata = 4;

// title is the title of the proposal.
string title = 5;

// summary is the summary of the proposal
string summary = 6;
}

// MsgSubmitProposalResponse defines the Msg/SubmitProposal response type.
Expand Down
4 changes: 2 additions & 2 deletions x/gov/abci_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func TestProposalPassedEndblocker(t *testing.T) {
require.NotNil(t, macc)
initialModuleAccCoins := suite.BankKeeper.GetAllBalances(ctx, macc.GetAddress())

proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "")
proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "", "title", "summary", addrs[0])
require.NoError(t, err)

proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, suite.StakingKeeper.TokensFromConsensusPower(ctx, 10))}
Expand Down Expand Up @@ -348,7 +348,7 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) {
staking.EndBlocker(ctx, suite.StakingKeeper)

msg := banktypes.NewMsgSend(authtypes.NewModuleAddress(types.ModuleName), addrs[0], sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000))))
proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{msg}, "")
proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{msg}, "", "Bank Msg Send", "send message", addrs[0])
require.NoError(t, err)

proposalCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, suite.StakingKeeper.TokensFromConsensusPower(ctx, 10)))
Expand Down
4 changes: 2 additions & 2 deletions x/gov/keeper/deposit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func TestDeposits(t *testing.T) {
TestAddrs := simtestutil.AddTestAddrsIncremental(bankKeeper, stakingKeeper, ctx, 2, sdk.NewInt(10000000))

tp := TestProposal
proposal, err := govKeeper.SubmitProposal(ctx, tp, "")
proposal, err := govKeeper.SubmitProposal(ctx, tp, "", "title", "description", TestAddrs[0])
require.NoError(t, err)
proposalID := proposal.Id

Expand Down Expand Up @@ -105,7 +105,7 @@ func TestDeposits(t *testing.T) {
require.Equal(t, addr1Initial, bankKeeper.GetAllBalances(ctx, TestAddrs[1]))

// Test delete and burn deposits
proposal, err = govKeeper.SubmitProposal(ctx, tp, "")
proposal, err = govKeeper.SubmitProposal(ctx, tp, "", "title", "description", TestAddrs[0])
require.NoError(t, err)
proposalID = proposal.Id
_, err = govKeeper.AddDeposit(ctx, proposalID, TestAddrs[0], fourStake)
Expand Down
8 changes: 4 additions & 4 deletions x/gov/keeper/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposal() {
testProposal := v1beta1.NewTextProposal("Proposal", "testing proposal")
msgContent, err := v1.NewLegacyContent(testProposal, govAcct.String())
suite.Require().NoError(err)
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "")
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "", "test", "summary")
suite.Require().NoError(err)
suite.Require().NotEmpty(submittedProposal)

Expand Down Expand Up @@ -127,7 +127,7 @@ func (suite *KeeperTestSuite) TestLegacyGRPCQueryProposal() {
testProposal := v1beta1.NewTextProposal("Proposal", "testing proposal")
msgContent, err := v1.NewLegacyContent(testProposal, govAcct.String())
suite.Require().NoError(err)
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "")
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "", "test", "summary")
suite.Require().NoError(err)
suite.Require().NotEmpty(submittedProposal)

Expand Down Expand Up @@ -188,7 +188,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() {
testProposal := []sdk.Msg{
v1.NewMsgVote(govAddress, uint64(i), v1.OptionYes, ""),
}
proposal, err := suite.govKeeper.SubmitProposal(ctx, testProposal, "")
proposal, err := suite.govKeeper.SubmitProposal(ctx, testProposal, "", "test", "summary")
suite.Require().NotEmpty(proposal)
suite.Require().NoError(err)
testProposals = append(testProposals, &proposal)
Expand Down Expand Up @@ -321,7 +321,7 @@ func (suite *KeeperTestSuite) TestLegacyGRPCQueryProposals() {
testProposal := v1beta1.NewTextProposal("Proposal", "testing proposal")
msgContent, err := v1.NewLegacyContent(testProposal, govAcct.String())
suite.Require().NoError(err)
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "")
submittedProposal, err := suite.govKeeper.SubmitProposal(ctx, []sdk.Msg{msgContent}, "", "test", "summary")
suite.Require().NoError(err)
suite.Require().NotEmpty(submittedProposal)
},
Expand Down
4 changes: 2 additions & 2 deletions x/gov/keeper/hooks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestHooks(t *testing.T) {
require.False(t, govHooksReceiver.AfterProposalVotingPeriodEndedValid)

tp := TestProposal
_, err := govKeeper.SubmitProposal(ctx, tp, "")
_, err := govKeeper.SubmitProposal(ctx, tp, "", "test", "summary", sdk.AccAddress("cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r"))
require.NoError(t, err)
require.True(t, govHooksReceiver.AfterProposalSubmissionValid)

Expand All @@ -74,7 +74,7 @@ func TestHooks(t *testing.T) {

require.True(t, govHooksReceiver.AfterProposalFailedMinDepositValid)

p2, err := govKeeper.SubmitProposal(ctx, tp, "")
p2, err := govKeeper.SubmitProposal(ctx, tp, "", "test", "summary", sdk.AccAddress("cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r"))
require.NoError(t, err)

activated, err := govKeeper.AddDeposit(ctx, p2.Id, addrs[0], minDeposit)
Expand Down
Loading