Skip to content

Commit 5f20d65

Browse files
authored
feat: remove kvindexer (#129)
* remove kvindexer * fix lint
1 parent a3faea8 commit 5f20d65

File tree

14 files changed

+1600
-5923
lines changed

14 files changed

+1600
-5923
lines changed

app/app.go

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ import (
6767
"github.com/initia-labs/miniwasm/app/keepers"
6868
"github.com/initia-labs/miniwasm/app/upgrades/v1_1_1"
6969

70-
// kvindexer
71-
kvindexermodule "github.com/initia-labs/kvindexer/x/kvindexer"
72-
kvindexerkeeper "github.com/initia-labs/kvindexer/x/kvindexer/keeper"
73-
7470
// unnamed import of statik for swagger UI support
7571
_ "github.com/initia-labs/miniwasm/client/docs/statik"
7672
)
@@ -117,18 +113,12 @@ type MinitiaApp struct {
117113

118114
// Override of BaseApp's CheckTx
119115
checkTxHandler blockchecktx.CheckTx
120-
121-
// indexer keeper for graceful shutdown
122-
kvIndexerKeeper *kvindexerkeeper.Keeper
123-
// indexer module for grpc-gateway registration
124-
kvIndexerModule *kvindexermodule.AppModuleBasic
125116
}
126117

127118
// NewMinitiaApp returns a reference to an initialized Initia.
128119
func NewMinitiaApp(
129120
logger log.Logger,
130121
db dbm.DB,
131-
kvindexerDB dbm.DB,
132122
traceStore io.Writer,
133123
loadLatest bool,
134124
wasmOpts []wasmkeeper.Option,
@@ -247,17 +237,6 @@ func NewMinitiaApp(
247237
tmos.Exit(err.Error())
248238
}
249239

250-
// setup indexer
251-
if kvIndexerKeeper, kvIndexerModule, streamingManager, err := setupIndexer(app, appOpts, encodingConfig, kvindexerDB); err != nil {
252-
tmos.Exit(err.Error())
253-
} else if kvIndexerKeeper != nil && kvIndexerModule != nil && streamingManager != nil {
254-
// register kvindexer keeper and module, and register services
255-
app.SetKVIndexer(kvIndexerKeeper, kvIndexerModule)
256-
257-
// override base-app's streaming manager
258-
app.SetStreamingManager(*streamingManager)
259-
}
260-
261240
// Only register upgrade handlers when loading the latest version of the app.
262241
// This optimization skips unnecessary handler registration during app initialization.
263242
//
@@ -392,13 +371,6 @@ func (app *MinitiaApp) setPostHandler() {
392371
app.SetPostHandler(postHandler)
393372
}
394373

395-
// SetKVIndexer sets the kvindexer keeper and module for the app and registers the services.
396-
func (app *MinitiaApp) SetKVIndexer(kvIndexerKeeper *kvindexerkeeper.Keeper, kvIndexerModule *kvindexermodule.AppModuleBasic) {
397-
app.kvIndexerKeeper = kvIndexerKeeper
398-
app.kvIndexerModule = kvIndexerModule
399-
app.kvIndexerModule.RegisterServices(app.configurator)
400-
}
401-
402374
// Name returns the name of the App
403375
func (app *MinitiaApp) Name() string { return app.BaseApp.Name() }
404376

@@ -500,11 +472,6 @@ func (app *MinitiaApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.AP
500472
// Register grpc-gateway routes for all modules.
501473
app.BasicModuleManager.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
502474

503-
// Register grpc-gateway routes for indexer module.
504-
if app.kvIndexerModule != nil {
505-
app.kvIndexerModule.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
506-
}
507-
508475
// register swagger API from root so that other applications can override easily
509476
if apiConfig.Swagger {
510477
RegisterSwaggerAPI(apiSvr.Router)
@@ -570,12 +537,6 @@ func GetMaccPerms() map[string][]string {
570537
// Close closes the underlying baseapp, the oracle service, and the prometheus server if required.
571538
// This method blocks on the closure of both the prometheus server, and the oracle-service
572539
func (app *MinitiaApp) Close() error {
573-
if app.kvIndexerKeeper != nil {
574-
if err := app.kvIndexerKeeper.Close(); err != nil {
575-
return err
576-
}
577-
}
578-
579540
if err := app.BaseApp.Close(); err != nil {
580541
return err
581542
}

app/app_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestInitGenesisOnMigration(t *testing.T) {
6868
db := dbm.NewMemDB()
6969
logger := log.NewLogger(os.Stdout)
7070
app := NewMinitiaApp(
71-
logger, db, getOrCreateMemDB(nil), nil, true, []wasmkeeper.Option{}, EmptyAppOptions{homeDir: t.TempDir()})
71+
logger, db, nil, true, []wasmkeeper.Option{}, EmptyAppOptions{homeDir: t.TempDir()})
7272
ctx := app.NewContextLegacy(true, cmtproto.Header{Height: app.LastBlockHeight()})
7373

7474
// Create a mock module. This module will serve as the new module we're
@@ -124,7 +124,7 @@ func TestGetKey(t *testing.T) {
124124
db := dbm.NewMemDB()
125125
app := NewMinitiaApp(
126126
log.NewLogger(os.Stdout),
127-
db, dbm.NewMemDB(), nil, true, []wasmkeeper.Option{}, EmptyAppOptions{homeDir: t.TempDir()})
127+
db, nil, true, []wasmkeeper.Option{}, EmptyAppOptions{homeDir: t.TempDir()})
128128

129129
require.NotEmpty(t, app.GetKey(banktypes.StoreKey))
130130
require.NotEmpty(t, app.GetMemKey(capabilitytypes.MemStoreKey))

app/encoding.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func tempApp() *MinitiaApp {
2626
return NewMinitiaApp(
2727
log.NewNopLogger(),
2828
dbm.NewMemDB(),
29-
dbm.NewMemDB(),
3029
nil,
3130
false,
3231
[]wasmkeeper.Option{},

app/indexer.go

Lines changed: 0 additions & 97 deletions
This file was deleted.

app/keepers/keepers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ import (
100100
forwarding "github.com/noble-assets/forwarding/v2"
101101
forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper"
102102
forwardingtypes "github.com/noble-assets/forwarding/v2/types"
103-
// kvindexer
104103
)
105104

106105
type AppKeepers struct {

app/test_helpers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func setup(homeDir string, db *dbm.DB, withGenesis bool) (*MinitiaApp, GenesisSt
5858
app := NewMinitiaApp(
5959
log.NewNopLogger(),
6060
getOrCreateMemDB(db),
61-
getOrCreateMemDB(nil),
6261
nil,
6362
true,
6463
[]wasmkeeper.Option{},

client/docs/config.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,6 @@
161161
}
162162
}
163163
},
164-
{
165-
"url": "./tmp-swagger-gen/indexer/info/query.swagger.json"
166-
},
167-
{
168-
"url": "./tmp-swagger-gen/indexer/block/v1/query.swagger.json"
169-
},
170-
{
171-
"url": "./tmp-swagger-gen/indexer/tx/v1/query.swagger.json"
172-
},
173-
{
174-
"url": "./tmp-swagger-gen/indexer/nft/v1/query.swagger.json"
175-
},
176-
{
177-
"url": "./tmp-swagger-gen/indexer/pair/v1/query.swagger.json"
178-
},
179164
{
180165
"url": "./tmp-swagger-gen/connect/oracle/v2/query.swagger.json"
181166
},

client/docs/statik/statik.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)