chore: clean-up after go-plugin system pr

baseapp/abci.go

@@ -219,7 +219,7 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 	for _, abciListener := range app.streamingManager.ABCIListeners {
 		ctx := app.deliverState.ctx
 		blockHeight := ctx.BlockHeight()
-		if err := abciListener.ListenBeginBlock(app.deliverState.ctx, req, res); err != nil {
+		if err := abciListener.ListenBeginBlock(ctx, req, res); err != nil {
 			app.logger.Error("BeginBlock listening hook failed", "height", blockHeight, "err", err)
 		}
 	}
@@ -426,15 +426,13 @@ func (app *BaseApp) DeliverTx(req abci.RequestDeliverTx) abci.ResponseDeliverTx
 		return sdkerrors.ResponseDeliverTxWithEvents(err, gInfo.GasWanted, gInfo.GasUsed, sdk.MarkEventsToIndex(anteEvents, app.indexEvents), app.trace)
 	}
 
-	res = abci.ResponseDeliverTx{
+	return abci.ResponseDeliverTx{
 		GasWanted: int64(gInfo.GasWanted), // TODO: Should type accept unsigned ints?
 		GasUsed:   int64(gInfo.GasUsed),   // TODO: Should type accept unsigned ints?
 		Log:       result.Log,
 		Data:      result.Data,
 		Events:    sdk.MarkEventsToIndex(result.Events, app.indexEvents),
 	}
-
-	return res
 }
 
 // Commit implements the ABCI interface. It will commit all state that exists in

baseapp/streaming.go

@@ -2,7 +2,6 @@ package baseapp
 
 import (
 	"fmt"
-	"os"
 	"sort"
 	"strings"
 
@@ -23,7 +22,7 @@ const (
 )
 
 // RegisterStreamingServices registers streaming services with the BaseApp.
-func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) {
+func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, keys map[string]*storetypes.KVStoreKey) error {
 	// register streaming services
 	streamingCfg := cast.ToStringMap(appOpts.Get(StreamingTomlKey))
 	for service := range streamingCfg {
@@ -33,15 +32,15 @@ func (app *BaseApp) RegisterStreamingServices(appOpts servertypes.AppOptions, ke
 			logLevel := cast.ToString(appOpts.Get(flags.FlagLogLevel))
 			plugin, err := streaming.NewStreamingPlugin(pluginName, logLevel)
 			if err != nil {
-				app.logger.Error("failed to load streaming plugin", "error", err)
-				os.Exit(1)
+				return fmt.Errorf("failed to load streaming plugin: %w", err)
 			}
 			if err := app.registerStreamingPlugin(appOpts, keys, plugin); err != nil {
-				app.logger.Error("failed to register streaming plugin", "error", err)
-				os.Exit(1)
+				return fmt.Errorf("failed to register streaming plugin %w", err)
 			}
 		}
 	}
+
+	return nil
 }
 
 // registerStreamingPlugin registers streaming plugins with the BaseApp.

simapp/app.go

@@ -260,7 +260,9 @@ func NewSimApp(
 	)
 
 	// register streaming services
-	bApp.RegisterStreamingServices(appOpts, keys)
+	if err := bApp.RegisterStreamingServices(appOpts, keys); err != nil {
+		panic(err)
+	}
 
 	tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
 	// NOTE: The testingkey is just mounted for testing purposes. Actual applications should

simapp/app_v2.go

@@ -252,7 +252,9 @@ func NewSimApp(
 	app.App = appBuilder.Build(logger, db, traceStore, baseAppOptions...)
 
 	// register streaming services
-	app.RegisterStreamingServices(appOpts, app.kvStoreKeys())
+	if err := app.RegisterStreamingServices(appOpts, app.kvStoreKeys()); err != nil {
+		panic(err)
+	}
 
 	/****  Module Options ****/
 

store/streaming/abci/README.md

@@ -302,10 +302,10 @@ func NewApp(...) *App {
             logLevel := cast.ToString(appOpts.Get(flags.FlagLogLevel))
             plugin, err := streaming.NewStreamingPlugin(pluginName, logLevel)
             if err != nil {
-                tmos.Exit(err.Error())
+                cmtos.Exit(err.Error())
             }
             if err := baseapp.RegisterStreamingPlugin(bApp, appOpts, keys, plugin); err != nil {
-                tmos.Exit(err.Error())
+                cmtos.Exit(err.Error())
             }
         }
     }