From 27f9851d64009cb444072b10e205358139203163 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Thu, 3 Nov 2022 13:00:00 +0100
Subject: [PATCH] fix: nil pointer when quitting `simd start` (#13743)

* fix: nil pointer when quitting `simd start`
* log error
---
 scripts/mockgen.sh            |  1 -
 server/start.go               |  8 +++++++-
 testutil/mock/types_router.go | 32 --------------------------------
 3 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 testutil/mock/types_router.go

diff --git a/scripts/mockgen.sh b/scripts/mockgen.sh
index dc55cd1fb24e..d32956c6cb42 100755
--- a/scripts/mockgen.sh
+++ b/scripts/mockgen.sh
@@ -5,7 +5,6 @@ $mockgen_cmd -source=client/account_retriever.go -package mock -destination test
 $mockgen_cmd -package mock -destination testutil/mock/tendermint_tm_db_DB.go github.com/tendermint/tm-db DB
 $mockgen_cmd -source=types/module/module.go -package mock -destination testutil/mock/types_module_module.go
 $mockgen_cmd -source=types/invariant.go -package mock -destination testutil/mock/types_invariant.go
-$mockgen_cmd -source=types/router.go -package mock -destination testutil/mock/types_router.go
 $mockgen_cmd -package mock -destination testutil/mock/grpc_server.go github.com/cosmos/gogoproto/grpc Server
 $mockgen_cmd -package mock -destination testutil/mock/tendermint_tendermint_libs_log_DB.go github.com/tendermint/tendermint/libs/log Logger
 $mockgen_cmd -source=orm/model/ormtable/hooks.go -package ormmocks -destination orm/testing/ormmocks/hooks.go
diff --git a/server/start.go b/server/start.go
index ef4d755f9ee7..9f3175839df9 100644
--- a/server/start.go
+++ b/server/start.go
@@ -289,7 +289,13 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App
 		if fn != nil {
 			fn()
 		}
-		traceWriter.Close()
+
+		// if flagTraceStore is not used then traceWriter is nil
+		if traceWriter != nil {
+			if err = traceWriter.Close(); err != nil {
+				ctx.Logger.Error("failed to close trace writer", "err", err)
+			}
+		}
 	}
 
 	config, err := serverconfig.GetConfig(ctx.Viper)
diff --git a/testutil/mock/types_router.go b/testutil/mock/types_router.go
deleted file mode 100644
index f64d86161771..000000000000
--- a/testutil/mock/types_router.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: types/router.go
-
-// Package mock is a generated GoMock package.
-package mock
-
-import (
-	gomock "github.com/golang/mock/gomock"
-)
-
-// MockQueryRouter is a mock of QueryRouter interface.
-type MockQueryRouter struct {
-	ctrl     *gomock.Controller
-	recorder *MockQueryRouterMockRecorder
-}
-
-// MockQueryRouterMockRecorder is the mock recorder for MockQueryRouter.
-type MockQueryRouterMockRecorder struct {
-	mock *MockQueryRouter
-}
-
-// NewMockQueryRouter creates a new mock instance.
-func NewMockQueryRouter(ctrl *gomock.Controller) *MockQueryRouter {
-	mock := &MockQueryRouter{ctrl: ctrl}
-	mock.recorder = &MockQueryRouterMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockQueryRouter) EXPECT() *MockQueryRouterMockRecorder {
-	return m.recorder
-}