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

refactor: simplify key-assignment logic #1684

Merged
merged 1 commit into from
Mar 7, 2024
Merged

refactor: simplify key-assignment logic #1684

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
40 changes: 16 additions & 24 deletions x/ccv/provider/keeper/key_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,37 +331,29 @@ func (k Keeper) AssignConsumerKey(
)
}

// check whether the consumer chain is already registered,
// i.e., a client to the consumer was already created
if _, consumerRegistered := k.GetConsumerClientId(ctx, chainID); consumerRegistered {
// get the previous key assigned for this validator on this consumer chain
oldConsumerKey, found := k.GetValidatorConsumerPubKey(ctx, chainID, providerAddr)
if found {
// mark this old consumer key as prunable once the VSCMaturedPacket
// get the previous key assigned for this validator on this consumer chain
if oldConsumerKey, found := k.GetValidatorConsumerPubKey(ctx, chainID, providerAddr); found {
oldConsumerAddrTmp, err := ccvtypes.TMCryptoPublicKeyToConsAddr(oldConsumerKey)
if err != nil {
return err
}
oldConsumerAddr := types.NewConsumerConsAddress(oldConsumerAddrTmp)

// check whether the consumer chain is already registered,
// i.e., a client to the consumer was already created
if _, consumerRegistered := k.GetConsumerClientId(ctx, chainID); consumerRegistered {
// mark the old consumer address as prunable once the VSCMaturedPacket
// for the current VSC ID is received;
// note: this state is removed on receiving the VSCMaturedPacket
oldConsumerAddrTmp, err := ccvtypes.TMCryptoPublicKeyToConsAddr(oldConsumerKey)
if err != nil {
return err
}
oldConsumerAddr := types.NewConsumerConsAddress(oldConsumerAddrTmp)
k.AppendConsumerAddrsToPrune(
ctx,
chainID,
k.GetValidatorSetUpdateId(ctx),
oldConsumerAddr,
)
}
} else {
// if the consumer chain is not registered, then remove the mapping
// from the old consumer address to the provider address (if any)
// get the previous key assigned for this validator on this consumer chain
if oldConsumerKey, found := k.GetValidatorConsumerPubKey(ctx, chainID, providerAddr); found {
oldConsumerAddrTmp, err := ccvtypes.TMCryptoPublicKeyToConsAddr(oldConsumerKey)
if err != nil {
return err
}
oldConsumerAddr := types.NewConsumerConsAddress(oldConsumerAddrTmp)
} else {
// if the consumer chain is not registered, then remove the mapping
// from the old consumer address to the provider address
k.DeleteValidatorByConsumerAddr(ctx, chainID, oldConsumerAddr)
}
}
Expand Down Expand Up @@ -424,7 +416,7 @@ func (k Keeper) DeleteKeyAssignments(ctx sdk.Context, chainID string) {
consumerAddr := types.NewConsumerConsAddress(validatorConsumerAddr.ConsumerAddr)
k.DeleteValidatorByConsumerAddr(ctx, chainID, consumerAddr)
}

// delete ValidatorConsumerPubKey
for _, consumerAddrsToPrune := range k.GetAllConsumerAddrsToPrune(ctx, chainID) {
k.DeleteConsumerAddrsToPrune(ctx, chainID, consumerAddrsToPrune.VscId)
Expand Down
Loading