feat: unify version modifier for v2 (#21508)
This commit is contained in:
@@ -15,7 +15,6 @@ import (
|
||||
"cosmossdk.io/core/appmodule"
|
||||
"cosmossdk.io/core/comet"
|
||||
"cosmossdk.io/core/registry"
|
||||
"cosmossdk.io/core/server"
|
||||
"cosmossdk.io/core/store"
|
||||
"cosmossdk.io/depinject"
|
||||
"cosmossdk.io/depinject/appconfig"
|
||||
@@ -103,7 +102,6 @@ func init() {
|
||||
ProvideEnvironment,
|
||||
ProvideTransientStoreService,
|
||||
ProvideModuleManager,
|
||||
ProvideAppVersionModifier,
|
||||
ProvideCometService,
|
||||
),
|
||||
appconfig.Invoke(SetupAppBuilder),
|
||||
@@ -293,10 +291,6 @@ func ProvideTransientStoreService(
|
||||
return transientStoreService{key: storeKey}
|
||||
}
|
||||
|
||||
func ProvideAppVersionModifier(app *AppBuilder) server.VersionModifier {
|
||||
return app.app
|
||||
}
|
||||
|
||||
func ProvideCometService() comet.Service {
|
||||
return NewContextAwareCometInfoService()
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ import (
|
||||
appmodulev2 "cosmossdk.io/core/appmodule/v2"
|
||||
"cosmossdk.io/core/comet"
|
||||
"cosmossdk.io/core/registry"
|
||||
"cosmossdk.io/core/server"
|
||||
"cosmossdk.io/core/store"
|
||||
"cosmossdk.io/core/transaction"
|
||||
"cosmossdk.io/depinject"
|
||||
@@ -98,7 +97,6 @@ func init() {
|
||||
ProvideEnvironment[transaction.Tx],
|
||||
ProvideModuleManager[transaction.Tx],
|
||||
ProvideCometService,
|
||||
ProvideAppVersionModifier[transaction.Tx],
|
||||
),
|
||||
appconfig.Invoke(SetupAppBuilder),
|
||||
)
|
||||
@@ -238,9 +236,3 @@ func storeKeyOverride(config *runtimev2.Module, moduleName string) *runtimev2.St
|
||||
func ProvideCometService() comet.Service {
|
||||
return &services.ContextAwareCometInfoService{}
|
||||
}
|
||||
|
||||
// ProvideAppVersionModifier returns nil, `app.VersionModifier` is a feature of BaseApp and neither used nor required for runtime/v2.
|
||||
// nil is acceptable, see: https://github.com/cosmos/cosmos-sdk/blob/0a6ee406a02477ae8ccbfcbe1b51fc3930087f4c/x/upgrade/keeper/keeper.go#L438
|
||||
func ProvideAppVersionModifier[T transaction.Tx](app *AppBuilder[T]) server.VersionModifier {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user