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: remove recovery module #109

Merged

Conversation

tkkwon1998
Copy link
Member

@tkkwon1998 tkkwon1998 commented Jul 28, 2023

Description

This pull request removes the x/recovery module from canto. This module is no longer used after issues regarding different key types were solved.

App.go is prepped for easy merging of x/onboarding (#103).


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...

  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • included the necessary unit and integration tests
  • reviewed "Files changed" and left comments if necessary

Reviewers 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.

I have...

  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

// Set the ICS4 wrappers for claims and recovery middlewares
app.RecoveryKeeper.SetICS4Wrapper(app.IBCKeeper.ChannelKeeper)
// Set the ICS4 wrappers for onboarding middleware
// SET ONBOARDING MIDDLEWARE ICS4 WRAPPER
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should set onboarding keeper ICS4Wrapper here

@@ -542,7 +504,7 @@ func NewCanto(
var transferStack porttypes.IBCModule

transferStack = transfer.NewIBCModule(app.TransferKeeper)
transferStack = recovery.NewIBCMiddleware(*app.RecoveryKeeper, transferStack)
// ADD ONBOARDING MIDDLEWARE TO TRANSFER STACK
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add onboarding to transfer stack

app.TransferKeeper = ibctransferkeeper.NewKeeper(
appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName), app.RecoveryKeeper,
appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName), app.IBCKeeper.ChannelKeeper,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must add app.OnboardingKeeper instead of placeholder app.IBCKeeper.ChannelKeeper

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add this to onboarding module PR

@tkkwon1998 tkkwon1998 marked this pull request as ready for review July 28, 2023 07:23
@tkkwon1998
Copy link
Member Author

@poorphd can you review this PR?

@poorphd
Copy link
Contributor

poorphd commented Jul 30, 2023

Everything LGTM. I will update onboarding PR once this gets merged.

Copy link
Collaborator

@zsystm zsystm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tkkwon1998 tkkwon1998 merged commit 2ff88d0 into Canto-Network:main Jul 31, 2023
@tkkwon1998 tkkwon1998 deleted the plex/remove-recovery-module branch July 31, 2023 04:38
@tkkwon1998 tkkwon1998 mentioned this pull request Jul 31, 2023
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants