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.

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

feat!: (x/gov) store an index of proposals that are in voting period #13576

Merged
merged 48 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
63c6057
(x/gov) feat: move parts of Proposal into separate storages
facundomedica Oct 18, 2022
d8219fc
fix some
facundomedica Oct 18, 2022
cb12f0e
fix others
facundomedica Oct 18, 2022
5514486
fix unit tests
facundomedica Oct 18, 2022
1d62ba4
fix unit tests
facundomedica Oct 18, 2022
4b97f7b
fix conflicts
facundomedica Oct 18, 2022
d9364d4
fix conflicts
facundomedica Oct 18, 2022
8e838f5
progress
facundomedica Oct 18, 2022
3fccb66
do not overwrite messages
facundomedica Oct 18, 2022
e2bef95
remove change
facundomedica Oct 18, 2022
82998ef
simplify methods
facundomedica Oct 19, 2022
da271d5
static data
facundomedica Oct 19, 2022
601c411
fix tests
facundomedica Oct 19, 2022
162353c
fix tests
facundomedica Oct 19, 2022
04e9308
fix tests
facundomedica Oct 19, 2022
d62d0c1
rollback some changes
facundomedica Oct 19, 2022
733f286
rollback some changes
facundomedica Oct 19, 2022
d7918b7
progress
facundomedica Oct 19, 2022
d9d339f
progress
facundomedica Oct 19, 2022
1f32225
progress
facundomedica Oct 19, 2022
b5b2ada
progress
facundomedica Oct 19, 2022
37af9c4
progress
facundomedica Oct 19, 2022
1a9a443
progress
facundomedica Oct 19, 2022
2edde57
add delete
facundomedica Oct 19, 2022
f4a128f
fix tests
facundomedica Oct 19, 2022
3f8936e
use SetProposalWithoutContents whenever possible
facundomedica Oct 19, 2022
46b087c
add migrations
facundomedica Oct 19, 2022
59dc8a7
fix godoc
facundomedica Oct 19, 2022
d7c8cd1
gofumpt
facundomedica Oct 19, 2022
78dbf6c
Merge branch 'main' into facu/gov-storage
facundomedica Oct 19, 2022
ece934d
add changelog
facundomedica Oct 19, 2022
c3af4cf
rolling back changes
facundomedica Oct 24, 2022
59434a7
rolling back changes
facundomedica Oct 24, 2022
2d07421
progress
facundomedica Oct 24, 2022
4ecb17c
progress
facundomedica Oct 24, 2022
c20b48f
progress
facundomedica Oct 24, 2022
dd38f3d
progress
facundomedica Oct 24, 2022
b6e24af
fix tests
facundomedica Oct 24, 2022
ecc8917
fix cl
facundomedica Oct 24, 2022
fc8b9d0
fix cl
facundomedica Oct 24, 2022
cd2ae66
fix
facundomedica Oct 24, 2022
ff62538
fix test error
facundomedica Oct 24, 2022
e23a08b
Merge branch 'main' into facu/gov-storage
facundomedica Oct 25, 2022
e42c114
add store key in readme
facundomedica Oct 26, 2022
97e54bd
add store key in readme
facundomedica Oct 26, 2022
0bda41c
Merge branch 'main' into facu/gov-storage
facundomedica Oct 26, 2022
8707966
Merge branch 'facu/gov-storage' of https://github.com/cosmos/cosmos-s…
facundomedica Oct 26, 2022
aa1ed8b
Merge branch 'main' into facu/gov-storage
facundomedica Oct 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
Prev Previous commit
Next Next commit
rollback some changes
  • Loading branch information
facundomedica committed Oct 19, 2022
commit d62d0c114e6f819081cfb40f3d04749f814012d2
12 changes: 6 additions & 6 deletions tests/integration/gov/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ func TestImportExportQueues(t *testing.T) {
require.NoError(t, err)
require.True(t, votingStarted)

proposal1, ok := s1.GovKeeper.GetProposal(ctx, proposalID1, false)
proposal1, ok := s1.GovKeeper.GetProposal(ctx, proposalID1)
require.True(t, ok)
proposal2, ok = s1.GovKeeper.GetProposal(ctx, proposalID2, false)
proposal2, ok = s1.GovKeeper.GetProposal(ctx, proposalID2)
require.True(t, ok)
require.True(t, proposal1.Status == v1.StatusDepositPeriod)
require.True(t, proposal2.Status == v1.StatusVotingPeriod)
Expand Down Expand Up @@ -139,9 +139,9 @@ func TestImportExportQueues(t *testing.T) {
ctx2 = ctx2.WithBlockTime(ctx2.BlockHeader().Time.Add(*s2.GovKeeper.GetParams(ctx2).MaxDepositPeriod).Add(*s2.GovKeeper.GetParams(ctx2).VotingPeriod))

// Make sure that they are still in the DepositPeriod and VotingPeriod respectively
proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1, false)
proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1)
require.True(t, ok)
proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2, false)
proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2)
require.True(t, ok)
require.True(t, proposal1.Status == v1.StatusDepositPeriod)
require.True(t, proposal2.Status == v1.StatusVotingPeriod)
Expand All @@ -152,10 +152,10 @@ func TestImportExportQueues(t *testing.T) {
// Run the endblocker. Check to make sure that proposal1 is removed from state, and proposal2 is finished VotingPeriod.
gov.EndBlocker(ctx2, s2.GovKeeper)

proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1, false)
proposal1, ok = s2.GovKeeper.GetProposal(ctx2, proposalID1)
require.False(t, ok)

proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2, false)
proposal2, ok = s2.GovKeeper.GetProposal(ctx2, proposalID2)
require.True(t, ok)
require.True(t, proposal2.Status == v1.StatusRejected)
}
4 changes: 2 additions & 2 deletions tests/integration/gov/keeper/grpc_query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryTally() {
func() {
proposal.Status = v1.StatusPassed
app.GovKeeper.SetProposal(ctx, proposal)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.Id, false)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.Id)

req = &v1.QueryTallyResultRequest{ProposalId: proposal.Id}

Expand Down Expand Up @@ -202,7 +202,7 @@ func (suite *KeeperTestSuite) TestLegacyGRPCQueryTally() {
func() {
proposal.Status = v1.StatusPassed
app.GovKeeper.SetProposal(ctx, proposal)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.Id, false)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.Id)

req = &v1beta1.QueryTallyResultRequest{ProposalId: proposal.Id}

Expand Down
30 changes: 15 additions & 15 deletions tests/integration/gov/keeper/tally_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestTallyNoOneVotes(t *testing.T) {
proposal.Status = v1.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -53,7 +53,7 @@ func TestTallyNoQuorum(t *testing.T) {
err = app.GovKeeper.AddVote(ctx, proposalID, addrs[0], v1.NewNonSplitVoteOption(v1.OptionYes), "")
require.Nil(t, err)

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, _ := app.GovKeeper.Tally(ctx, proposal)
require.False(t, passes)
Expand All @@ -77,7 +77,7 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionYes), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -102,7 +102,7 @@ func TestTallyOnlyValidators51No(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[0], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, _ := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -126,7 +126,7 @@ func TestTallyOnlyValidators51Yes(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[0], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[1], v1.NewNonSplitVoteOption(v1.OptionYes), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -152,7 +152,7 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[1], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[2], v1.NewNonSplitVoteOption(v1.OptionNoWithVeto), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -178,7 +178,7 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[2], v1.NewNonSplitVoteOption(v1.OptionYes), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -204,7 +204,7 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[1], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddrs[2], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand All @@ -230,7 +230,7 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddr1, v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, valAccAddr2, v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -266,7 +266,7 @@ func TestTallyDelgatorOverride(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[3], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[4], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -301,7 +301,7 @@ func TestTallyDelgatorInherit(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionYes), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -341,7 +341,7 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionYes), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[3], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -382,7 +382,7 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -425,7 +425,7 @@ func TestTallyJailedValidator(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionNo), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down Expand Up @@ -458,7 +458,7 @@ func TestTallyValidatorMultipleDelegations(t *testing.T) {
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], v1.NewNonSplitVoteOption(v1.OptionNo), ""))
require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], v1.NewNonSplitVoteOption(v1.OptionYes), ""))

proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
passes, burnDeposits, tallyResults := app.GovKeeper.Tally(ctx, proposal)

Expand Down
2 changes: 1 addition & 1 deletion x/gov/abci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func TestTickPassedVotingPeriod(t *testing.T) {
require.True(t, activeQueue.Valid())

activeProposalID := types.GetProposalIDFromBytes(activeQueue.Value())
proposal, ok := suite.GovKeeper.GetProposal(ctx, activeProposalID, false)
proposal, ok := suite.GovKeeper.GetProposal(ctx, activeProposalID)
require.True(t, ok)
require.Equal(t, v1.StatusVotingPeriod, proposal.Status)

Expand Down
2 changes: 1 addition & 1 deletion x/gov/keeper/deposit.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (keeper Keeper) IterateDeposits(ctx sdk.Context, proposalID uint64, cb func
// Activates voting period when appropriate and returns true in that case, else returns false.
func (keeper Keeper) AddDeposit(ctx sdk.Context, proposalID uint64, depositorAddr sdk.AccAddress, depositAmount sdk.Coins) (bool, error) {
// Checks to see if proposal exists
proposal, ok := keeper.GetProposal(ctx, proposalID, false)
proposal, ok := keeper.GetProposal(ctx, proposalID)
if !ok {
return false, sdkerrors.Wrapf(types.ErrUnknownProposal, "%d", proposalID)
}
Expand Down
10 changes: 5 additions & 5 deletions x/gov/keeper/deposit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestDeposits(t *testing.T) {
// Check no deposits at beginning
deposit, found := govKeeper.GetDeposit(ctx, proposalID, TestAddrs[1])
require.False(t, found)
proposal, ok := govKeeper.GetProposal(ctx, proposalID, false)
proposal, ok := govKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
require.Nil(t, proposal.VotingStartTime)

Expand All @@ -48,7 +48,7 @@ func TestDeposits(t *testing.T) {
require.True(t, found)
require.Equal(t, fourStake, sdk.NewCoins(deposit.Amount...))
require.Equal(t, TestAddrs[0].String(), deposit.Depositor)
proposal, ok = govKeeper.GetProposal(ctx, proposalID, false)
proposal, ok = govKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
require.Equal(t, fourStake, sdk.NewCoins(proposal.TotalDeposit...))
require.Equal(t, addr0Initial.Sub(fourStake...), bankKeeper.GetAllBalances(ctx, TestAddrs[0]))
Expand All @@ -61,7 +61,7 @@ func TestDeposits(t *testing.T) {
require.True(t, found)
require.Equal(t, fourStake.Add(fiveStake...), sdk.NewCoins(deposit.Amount...))
require.Equal(t, TestAddrs[0].String(), deposit.Depositor)
proposal, ok = govKeeper.GetProposal(ctx, proposalID, false)
proposal, ok = govKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
require.Equal(t, fourStake.Add(fiveStake...), sdk.NewCoins(proposal.TotalDeposit...))
require.Equal(t, addr0Initial.Sub(fourStake...).Sub(fiveStake...), bankKeeper.GetAllBalances(ctx, TestAddrs[0]))
Expand All @@ -74,13 +74,13 @@ func TestDeposits(t *testing.T) {
require.True(t, found)
require.Equal(t, TestAddrs[1].String(), deposit.Depositor)
require.Equal(t, fourStake, sdk.NewCoins(deposit.Amount...))
proposal, ok = govKeeper.GetProposal(ctx, proposalID, false)
proposal, ok = govKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
require.Equal(t, fourStake.Add(fiveStake...).Add(fourStake...), sdk.NewCoins(proposal.TotalDeposit...))
require.Equal(t, addr1Initial.Sub(fourStake...), bankKeeper.GetAllBalances(ctx, TestAddrs[1]))

// Check that proposal moved to voting period
proposal, ok = govKeeper.GetProposal(ctx, proposalID, false)
proposal, ok = govKeeper.GetProposal(ctx, proposalID)
require.True(t, ok)
require.True(t, proposal.VotingStartTime.Equal(ctx.BlockHeader().Time))

Expand Down
4 changes: 2 additions & 2 deletions x/gov/keeper/grpc_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (q Keeper) Proposal(c context.Context, req *v1.QueryProposalRequest) (*v1.Q

ctx := sdk.UnwrapSDKContext(c)

proposal, found := q.GetProposal(ctx, req.ProposalId, true)
proposal, found := q.GetProposal(ctx, req.ProposalId)
if !found {
return nil, status.Errorf(codes.NotFound, "proposal %d doesn't exist", req.ProposalId)
}
Expand Down Expand Up @@ -263,7 +263,7 @@ func (q Keeper) TallyResult(c context.Context, req *v1.QueryTallyResultRequest)

ctx := sdk.UnwrapSDKContext(c)

proposal, ok := q.GetProposal(ctx, req.ProposalId, false)
proposal, ok := q.GetProposal(ctx, req.ProposalId)
if !ok {
return nil, status.Errorf(codes.NotFound, "proposal %d doesn't exist", req.ProposalId)
}
Expand Down
4 changes: 2 additions & 2 deletions x/gov/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func (keeper Keeper) IterateActiveProposalsQueue(ctx sdk.Context, endTime time.T
defer iterator.Close()
for ; iterator.Valid(); iterator.Next() {
proposalID, _ := types.SplitActiveProposalQueueKey(iterator.Key())
proposal, found := keeper.GetProposal(ctx, proposalID, false)
proposal, found := keeper.GetProposal(ctx, proposalID)
if !found {
panic(fmt.Sprintf("proposal %d does not exist", proposalID))
}
Expand All @@ -198,7 +198,7 @@ func (keeper Keeper) IterateInactiveProposalsQueue(ctx sdk.Context, endTime time
defer iterator.Close()
for ; iterator.Valid(); iterator.Next() {
proposalID, _ := types.SplitInactiveProposalQueueKey(iterator.Key())
proposal, found := keeper.GetProposal(ctx, proposalID, false)
proposal, found := keeper.GetProposal(ctx, proposalID)
if !found {
panic(fmt.Sprintf("proposal %d does not exist", proposalID))
}
Expand Down
2 changes: 1 addition & 1 deletion x/gov/keeper/keeper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func TestProposalQueues(t *testing.T) {

govKeeper.ActivateVotingPeriod(ctx, proposal)

proposal, ok := govKeeper.GetProposal(ctx, proposal.Id, false)
proposal, ok := govKeeper.GetProposal(ctx, proposal.Id)
require.True(t, ok)

activeIterator := govKeeper.ActiveProposalQueueIterator(ctx, *proposal.VotingEndTime)
Expand Down
8 changes: 3 additions & 5 deletions x/gov/keeper/proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (keeper Keeper) SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadat
// GetProposal gets a proposal from store by ProposalID.
// If withStaticData is true, it will get the proposal's messages from the separate store.
// Panics if can't unmarshal the proposal.
func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64, withStaticData bool) (v1.Proposal, bool) {
func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64) (v1.Proposal, bool) {
store := ctx.KVStore(keeper.storeKey)

bz := store.Get(types.ProposalKey(proposalID))
Expand All @@ -112,9 +112,7 @@ func (keeper Keeper) GetProposal(ctx sdk.Context, proposalID uint64, withStaticD
panic(err)
}

if withStaticData {
keeper.PopulateProposalStaticData(ctx, &proposal)
}
keeper.PopulateProposalStaticData(ctx, &proposal)

return proposal, true
}
Expand Down Expand Up @@ -193,7 +191,7 @@ func (keeper Keeper) getProposalStaticData(ctx sdk.Context, proposalID uint64) (
// Panics if the proposal doesn't exist.
func (keeper Keeper) DeleteProposal(ctx sdk.Context, proposalID uint64) {
store := ctx.KVStore(keeper.storeKey)
proposal, ok := keeper.GetProposal(ctx, proposalID, false)
proposal, ok := keeper.GetProposal(ctx, proposalID)
if !ok {
panic(fmt.Sprintf("couldn't find proposal with id#%d", proposalID))
}
Expand Down
4 changes: 2 additions & 2 deletions x/gov/keeper/proposal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (suite *KeeperTestSuite) TestGetSetProposal() {
proposalID := proposal.Id
suite.govKeeper.SetProposal(suite.ctx, proposal)

gotProposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposalID, true)
gotProposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposalID)
suite.Require().True(ok)
suite.Require().Equal(proposal, gotProposal)
}
Expand All @@ -37,7 +37,7 @@ func (suite *KeeperTestSuite) TestActivateVotingPeriod() {

suite.govKeeper.ActivateVotingPeriod(suite.ctx, proposal)

proposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposal.Id, false)
proposal, ok := suite.govKeeper.GetProposal(suite.ctx, proposal.Id)
suite.Require().True(ok)
suite.Require().True(proposal.VotingStartTime.Equal(suite.ctx.BlockHeader().Time))

Expand Down
2 changes: 1 addition & 1 deletion x/gov/keeper/vote.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

// AddVote adds a vote on a specific proposal
func (keeper Keeper) AddVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.AccAddress, options v1.WeightedVoteOptions, metadata string) error {
proposal, ok := keeper.GetProposal(ctx, proposalID, false)
proposal, ok := keeper.GetProposal(ctx, proposalID)
if !ok {
return sdkerrors.Wrapf(types.ErrUnknownProposal, "%d", proposalID)
}
Expand Down
2 changes: 1 addition & 1 deletion x/gov/simulation/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func randomProposalID(r *rand.Rand, k *keeper.Keeper, ctx sdk.Context, status v1
initialProposalID = proposalID
}

proposal, ok := k.GetProposal(ctx, proposalID, false)
proposal, ok := k.GetProposal(ctx, proposalID)
if !ok || proposal.Status != status {
return proposalID, false
}
Expand Down