fix: Do not call Remove during Walk #24044
Conversation
|
I checked, made sure I didn't miss anything. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
|
lint and tests failing here |
Do you want me to fix it in this PR? or create a new issue? |
yeah, we should fix in this PR |
github-actions
bot
added
C:x/staking
C:CLI
C:x/slashing
C:x/distribution
github-actions
bot
removed
C:x/staking
C:x/slashing
C:x/distribution
github-actions
bot
removed
C:x/mint
C:Store
C:x/bank
C:x/auth
C:x/evidence
C:x/upgrade
C:x/feegrant
C:x/genutil
|
@aljo242 I've fixed them. Please review again when you have time.
|
Co-authored-by: Alex | Interchain Labs <[email protected]>
| @@ -24,35 +24,45 @@ | |||
| // delete dead proposals from store and returns theirs deposits. | |||
| // A proposal is dead when it's inactive and didn't get enough deposit on time to get into voting phase. | |||
| rng := collections.NewPrefixUntilPairRange[time.Time, uint64](ctx.BlockTime()) | |||
| err := keeper.InactiveProposalsQueue.Walk(ctx, rng, func(key collections.Pair[time.Time, uint64], _ uint64) (bool, error) { | |||
| proposal, err := keeper.Proposals.Get(ctx, key.K2()) | |||
| iter, err := keeper.InactiveProposalsQueue.Iterate(ctx, rng) | |||
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
| return err | ||
| } | ||
|
|
||
| inactiveProps, err := iter.KeyValues() |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
| } | ||
|
|
||
| for _, prop := range inactiveProps { | ||
| proposal, err := keeper.Proposals.Get(ctx, prop.Key.K2()) |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
|
|
||
| // fetch active proposals whose voting periods have ended (are passed the block time) | ||
| rng = collections.NewPrefixUntilPairRange[time.Time, uint64](ctx.BlockTime()) | ||
| iter, err = keeper.ActiveProposalsQueue.Iterate(ctx, rng) |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
|
|
||
| return false, nil | ||
| }) | ||
| activeProps, err := iter.KeyValues() |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
| err = keeper.ActiveProposalsQueue.Walk(ctx, rng, func(key collections.Pair[time.Time, uint64], _ uint64) (bool, error) { | ||
| proposal, err := keeper.Proposals.Get(ctx, key.K2()) | ||
| for _, prop := range activeProps { | ||
| proposal, err := keeper.Proposals.Get(ctx, prop.Key.K2()) |
Check warning
Code scanning / CodeQL
Panic in BeginBock or EndBlock consensus methods Warning
Description
Closes: #23806
backport:#19833 , #19851
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...
!in the type prefix if API or client breaking changeCHANGELOG.mdReviewers 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.
Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.
I have...