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

chore: add compiler assertions for capability module #4654

Merged
merged 8 commits into from
Sep 14, 2023
Merged

chore: add compiler assertions for capability module #4654

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
62979f5
chore: add compiler assertions for capability module
colin-axner Sep 13, 2023
6b94fed
chore: add HasGenesis assertion
colin-axner Sep 13, 2023
c9ccdba
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 13, 2023
2735dd9
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 14, 2023
e22cbfd
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 14, 2023
9b7dfde
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 14, 2023
b069e95
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 14, 2023
2c0cf90
Merge branch 'main' into colin/capability-compiler-assertions
colin-axner Sep 14, 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
17 changes: 5 additions & 12 deletions modules/capability/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"

abci "github.com/cometbft/cometbft/abci/types"

"github.com/cosmos/ibc-go/modules/capability/keeper"
"github.com/cosmos/ibc-go/modules/capability/simulation"
"github.com/cosmos/ibc-go/modules/capability/types"
)

var (
_ module.AppModule = (*AppModule)(nil)
_ module.AppModuleBasic = (*AppModuleBasic)(nil)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we can safely remove this assertion and the associated functions

Copy link
Contributor

Choose a reason for hiding this comment

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

because AppModule is AppModuleBasic :D makes sense!

_ module.AppModuleSimulation = (*AppModule)(nil)
_ module.HasName = (*AppModule)(nil)
_ module.HasConsensusVersion = (*AppModule)(nil)
_ module.HasGenesis = (*AppModule)(nil)
_ appmodule.AppModule = (*AppModule)(nil)
_ appmodule.HasBeginBlocker = (*AppModule)(nil)
)
Expand Down Expand Up @@ -113,23 +115,14 @@ func (am AppModule) Name() string {
return am.AppModuleBasic.Name()
}

// RegisterServices registers a GRPC query service to respond to the
// module-specific GRPC queries.
func (AppModule) RegisterServices(module.Configurator) {}

// RegisterInvariants registers the capability module's invariants.
func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {}

// InitGenesis performs the capability module's genesis initialization It returns
// no validator updates.
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.RawMessage) []abci.ValidatorUpdate {
func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.RawMessage) {
var genState types.GenesisState
// Initialize global index to index in genesis state
cdc.MustUnmarshalJSON(gs, &genState)

InitGenesis(ctx, am.keeper, genState)

return []abci.ValidatorUpdate{}
}

// ExportGenesis returns the capability module's exported genesis state as raw JSON bytes.
Expand Down