From ae3dcd1df62457e0e155e41379db8b79d6ee425d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= <juergen@riddleandcode.com>
Date: Fri, 2 May 2025 13:30:37 +0200
Subject: [PATCH] pleaseing the linter (2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
---
 app/app.go              | 6 +++---
 app/export.go           | 9 ++-------
 monitor/mqtt_monitor.go | 5 +++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/app.go b/app/app.go
index 6310cf6..a5d397c 100644
--- a/app/app.go
+++ b/app/app.go
@@ -621,7 +621,7 @@ func New(
 		genutil.NewAppModule(
 			app.AccountKeeper,
 			app.StakingKeeper,
-			app.BaseApp.DeliverTx,
+			app.DeliverTx,
 			encodingConfig.TxConfig,
 		),
 		auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)),
@@ -939,14 +939,14 @@ func (app *App) RegisterAPIRoutes(apiSvr *api.Server, _ config.APIConfig) {
 
 // RegisterTxService implements the Application.RegisterTxService method.
 func (app *App) RegisterTxService(clientCtx client.Context) {
-	authtx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry)
+	authtx.RegisterTxService(app.GRPCQueryRouter(), clientCtx, app.Simulate, app.interfaceRegistry)
 }
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.
 func (app *App) RegisterTendermintService(clientCtx client.Context) {
 	tmservice.RegisterTendermintService(
 		clientCtx,
-		app.BaseApp.GRPCQueryRouter(),
+		app.GRPCQueryRouter(),
 		app.interfaceRegistry,
 		app.Query,
 	)
diff --git a/app/export.go b/app/export.go
index 647f93f..4fa6ef5 100644
--- a/app/export.go
+++ b/app/export.go
@@ -41,7 +41,7 @@ func (app *App) ExportAppStateAndValidators(
 		AppState:        appState,
 		Validators:      validators,
 		Height:          height,
-		ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
+		ConsensusParams: app.GetConsensusParams(ctx),
 	}, err
 }
 
@@ -50,13 +50,8 @@ func (app *App) ExportAppStateAndValidators(
 // NOTE zero height genesis is a temporary feature which will be deprecated
 // in favour of export at a block height
 func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
-	applyAllowedAddrs := false
-
 	// check if there is a allowed address list
-	if len(jailAllowedAddrs) > 0 {
-		applyAllowedAddrs = true
-	}
-
+	applyAllowedAddrs := (len(jailAllowedAddrs) > 0)
 	allowedAddrsMap := make(map[string]bool)
 
 	for _, addr := range jailAllowedAddrs {
diff --git a/monitor/mqtt_monitor.go b/monitor/mqtt_monitor.go
index c0f7e35..5b36d74 100644
--- a/monitor/mqtt_monitor.go
+++ b/monitor/mqtt_monitor.go
@@ -149,7 +149,8 @@ func (mms *MqttMonitor) SelectPoPParticipantsOutOfActiveActors() (challenger str
 	found := 0
 	var lastSeen LastSeenEvent
 	for iter.Next() {
-		if count == randomChallenger {
+		switch count {
+		case randomChallenger:
 			lastSeen, err = mms.getDataFromIter(iter)
 			if err != nil {
 				Log("could not get Data from ID" + strconv.Itoa(randomChallenger))
@@ -157,7 +158,7 @@ func (mms *MqttMonitor) SelectPoPParticipantsOutOfActiveActors() (challenger str
 			}
 			challenger = lastSeen.Address
 			found++
-		} else if count == randomChallengee {
+		case randomChallengee:
 			lastSeen, err = mms.getDataFromIter(iter)
 			if err != nil {
 				Log("could not get Data from ID" + strconv.Itoa(randomChallengee))