Skip to content

Fix validator entry delete logic #47

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

Merged
lazynina merged 1 commit into from
May 2, 2024
Merged

Fix validator entry delete logic #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 25 additions & 17 deletions entries/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,28 +163,36 @@ func bulkInsertValidatorEntry(entries []*lib.StateChangeEntry, db bun.IDB, opera
func bulkDeleteValidatorEntry(entries []*lib.StateChangeEntry, db bun.IDB, operationType lib.StateSyncerOperationType) error {
// Track the unique entries we've inserted so we don't insert the same entry twice.
uniqueEntries := consumer.UniqueEntries(entries)
uniqueKeys := consumer.KeysToDelete(uniqueEntries)

// Transform the entries into a list of keys to delete.
validatorEntriesToDelete := consumer.FilterEntriesByPrefix(uniqueEntries, lib.Prefixes.PrefixValidatorByPKID)
validatorKeysToDelete := consumer.FilterKeysByPrefix(uniqueKeys, lib.Prefixes.PrefixValidatorByPKID)

snapshotValidatorEntriesToDelete := consumer.FilterEntriesByPrefix(uniqueEntries, lib.Prefixes.PrefixSnapshotValidatorSetByPKID)
snapshotValidatorKeysToDelete := consumer.FilterKeysByPrefix(
uniqueKeys,
lib.Prefixes.PrefixSnapshotValidatorSetByPKID,
)

// Execute the delete query for validator entries.
if _, err := db.NewDelete().
Model(&PGValidatorEntry{}).
Where("badger_key IN (?)", bun.In(validatorEntriesToDelete)).
Returning("").
Exec(context.Background()); err != nil {
return errors.Wrapf(err, "entries.bulkDeleteValidatorEntry: Error deleting entries")
}

// Execute the delete query.
if _, err := db.NewDelete().
Model(&PGSnapshotValidatorEntry{}).
Where("badger_key IN (?)", bun.In(snapshotValidatorEntriesToDelete)).
Returning("").
Exec(context.Background()); err != nil {
return errors.Wrapf(err, "entries.bulkDeleteSnapshotValidatorEntry: Error deleting entries")
if len(validatorKeysToDelete) > 0 {
if _, err := db.NewDelete().
Model(&PGValidatorEntry{}).
Where("badger_key IN (?)", bun.In(validatorKeysToDelete)).
Returning("").
Exec(context.Background()); err != nil {
return errors.Wrapf(err, "entries.bulkDeleteValidatorEntry: Error deleting entries")
}
}

// Execute the delete query for snapshot validator entries.
if len(snapshotValidatorKeysToDelete) > 0 {
if _, err := db.NewDelete().
Model(&PGSnapshotValidatorEntry{}).
Where("badger_key IN (?)", bun.In(snapshotValidatorKeysToDelete)).
Returning("").
Exec(context.Background()); err != nil {
return errors.Wrapf(err, "entries.bulkDeleteSnapshotValidatorEntry: Error deleting entries")
}
}

return nil
Expand Down