LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fix: nil pointer when quitting simd start (#13743)

Browse Source 
* fix: nil pointer when quitting `simd start`
* log error
This commit is contained in:
Julien Robert 2022-11-03 13:00:00 +01:00 committed by GitHub
parent ad0e41d7c7
commit 27f9851d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/mockgen.sh
View File

@ -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

8
server/start.go
View File

@ -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)

32
testutil/mock/types_router.go
View File

@ -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
}