refactor: remove viper as a direct dependency #21635
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package server | ||
|
|
||
| // DynamicConfig defines an interface for configuration that can be dynamically | ||
| // fetched at runtime by an arbitrary key. | ||
| type DynamicConfig interface { | ||
| Get(string) any | ||
| GetString(string) string | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,10 +7,9 @@ import ( | |
| "io" | ||
| "path/filepath" | ||
|
|
||
| "cosmossdk.io/core/appmodule" | ||
| appmodulev2 "cosmossdk.io/core/appmodule/v2" | ||
| "cosmossdk.io/core/server" | ||
| "cosmossdk.io/core/store" | ||
| "cosmossdk.io/core/transaction" | ||
| "cosmossdk.io/server/v2/appmanager" | ||
|
|
@@ -25,8 +24,8 @@ import ( | |
| // the existing app.go initialization conventions. | ||
| type AppBuilder[T transaction.Tx] struct { | ||
| app *App[T] | ||
| config server.DynamicConfig | ||
| storeOptions rootstore.Options | ||
|
|
||
| // the following fields are used to overwrite the default | ||
| branch func(state store.ReaderMap) store.WriterMap | ||
|
|
@@ -73,9 +72,6 @@ func (a *AppBuilder[T]) RegisterModules(modules map[string]appmodulev2.AppModule | |
| // To be used in combination of RegisterModules. | ||
| func (a *AppBuilder[T]) RegisterStores(keys ...string) { | ||
| a.app.storeKeys = append(a.app.storeKeys, keys...) | ||
| } | ||
|
|
||
| // Build builds an *App instance. | ||
|
|
@@ -124,29 +120,26 @@ func (a *AppBuilder[T]) Build(opts ...AppBuilderOption[T]) (*App[T], error) { | |
| } | ||
| a.app.stf = stf | ||
|
|
||
| home := a.config.GetString(FlagHome) | ||
| scRawDb, err := db.NewDB( | ||
| db.DBType(a.config.GetString("store.app-db-backend")), | ||
| "application", | ||
| filepath.Join(home, "data"), | ||
| nil, | ||
| ) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| factoryOptions := &rootstore.FactoryOptions{ | ||
| Logger: a.app.logger, | ||
| RootDir: home, | ||
| Options: a.storeOptions, | ||
|
There was a problem hiding this comment. Shall we still use the default from DefaultStoreOptions if nothing is provided? |
||
| StoreKeys: append(a.app.storeKeys, "stf"), | ||
| SCRawDB: scRawDb, | ||
| } | ||
|
|
||
| rs, err := rootstore.CreateRootStore(factoryOptions) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create root store: %w", err) | ||
| } | ||
|
|
@@ -217,14 +210,14 @@ func AppBuilderWithTxValidator[T transaction.Tx](txValidators func(ctx context.C | |
|
|
||
| // AppBuilderWithPostTxExec sets logic that will be executed after each transaction. | ||
| // When not provided, a no-op function will be used. | ||
| func AppBuilderWithPostTxExec[T transaction.Tx](postTxExec func(ctx context.Context, tx T, success bool) error) AppBuilderOption[T] { | ||
| return func(a *AppBuilder[T]) { | ||
| a.postTxExec = postTxExec | ||
| } | ||
| } | ||
|
|
||
| func AppBuilderWithStoreOptions[T transaction.Tx](opts rootstore.Options) AppBuilderOption[T] { | ||
|
There was a problem hiding this comment. Thinking about it longer, maybe we could just do a manual unmarshal: basically setting the store options struct manually by getting stuff only. There was a problem hiding this comment. Sorry I'm not following your proposal, what does a manual unmarshal look like here? There was a problem hiding this comment. For reference, I moved this code snippet (previously in cosmos-sdk/simapp/v2/app_di.go Lines 193 to 198 in 5731e34 When I tried to use cosmos-sdk/server/v2/config.go Lines 42 to 73 in 5731e34 There was a problem hiding this comment. I feel like store/v2 should be handling the unmarshalling somehow since that's where the config is defined. cosmos-sdk/store/v2/root/factory.go Lines 37 to 43 in 2580aff There was a problem hiding this comment. Basically doing: func getStoreOptions(dynamicCfg server.dynamicCfg) rootstore.Options {
storeOpts := rootstore.DefaultStoreOptions()
if ssType := dynamicCfg.GetString("store.options.ss-type"); ssType != "" {
storeOpts.SSType = rootstore.SSType(ssType)
}
if scType := dynamicCfg.GetString("store.options.sc-type"); scType != "" {
storeOpts.SCType = rootstore.SCType(scType)
}
// ...
return storeOpts
}directly in runtime. This way we don't need the user to add that in their app.go. There was a problem hiding this comment. May be overkilled, but I like the idea of not adding any manual work for the user in app.toml |
||
| return func(a *AppBuilder[T]) { | ||
| a.storeOptions = opts | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏾