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(distribution)!: use collections for ValidatorHistoricalRewards state #16607

Merged
merged 25 commits into from
Jun 22, 2023
Merged

refactor(distribution)!: use collections for ValidatorHistoricalRewards state #16607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
508e6d3
start migrating validator historical rewards
Jun 19, 2023
847d80d
remove IterateValidatorHistoricalRewards
Jun 19, 2023
dcecfd3
remove DeleteValidatorHistoricalRewards
Jun 19, 2023
8e420e6
add Clear method
Jun 19, 2023
7ac0a04
add Clear method to KeySet
Jun 19, 2023
51cba3e
remove DeleteValidatorHistoricalRewards
Jun 19, 2023
b601457
remove DeleteAllValidatorHistoricalRewards
Jun 19, 2023
8236041
remove SetAllValidatorHistoricalRewards
Jun 19, 2023
caf0dab
remove GetAllValidatorHistoricalRewards
Jun 19, 2023
94a7142
check err
Jun 19, 2023
8f0ae2b
docs
Jun 19, 2023
0ee37ea
test more thoroughly
Jun 19, 2023
1a7840d
format
Jun 19, 2023
2a1c43a
wtf format on english
Jun 19, 2023
1a10f8d
remove more things
Jun 19, 2023
5ed1f9a
chore: CHANGELOG.md
Jun 19, 2023
aa76b38
chore: CHANGELOG.md
Jun 19, 2023
77fcf41
Merge branch 'main' into tip/distribution/coll_historical_rewards
Jun 20, 2023
0250c8b
tidy
Jun 20, 2023
84fce22
go mod tidy all
Jun 20, 2023
f7c32df
address PR reviews
Jun 20, 2023
698ffae
address PR reviews2
Jun 20, 2023
02c5951
fix test
Jun 22, 2023
32844ab
Merge branch 'main' into tip/distribution/coll_historical_rewards
Jun 22, 2023
28f864c
go mod tidy all
Jun 22, 2023
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
remove DeleteValidatorHistoricalRewards
  • Loading branch information
unknown unknown committed Jun 19, 2023
commit dcecfd38bdb24824d4394a1528bac7b63230827a
6 changes: 0 additions & 6 deletions x/distribution/keeper/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ func (k Keeper) SetValidatorHistoricalRewards(ctx context.Context, val sdk.ValAd
return k.ValidatorHistoricalRewards.Set(ctx, collections.Join(val, period), rewards)
}

// delete a historical reward
func (k Keeper) DeleteValidatorHistoricalReward(ctx context.Context, val sdk.ValAddress, period uint64) error {
store := k.storeService.OpenKVStore(ctx)
return store.Delete(types.GetValidatorHistoricalRewardsKey(val, period))
}

// delete historical rewards for a validator
func (k Keeper) DeleteValidatorHistoricalRewards(ctx context.Context, val sdk.ValAddress) {
store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
Expand Down
2 changes: 1 addition & 1 deletion x/distribution/keeper/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (k Keeper) decrementReferenceCount(ctx context.Context, valAddr sdk.ValAddr
}
historical.ReferenceCount--
if historical.ReferenceCount == 0 {
return k.DeleteValidatorHistoricalReward(ctx, valAddr, period)
return k.ValidatorHistoricalRewards.Remove(ctx, collections.Join(valAddr, period))
}

return k.SetValidatorHistoricalRewards(ctx, valAddr, period, historical)
Expand Down