mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-21 07:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

service: remove stop method and use contexts (#7292)

Browse Source
This commit is contained in:
Sam Kleinman
2021-11-18 17:56:21 -05:00
committed by GitHub
parent 1c34d17240
commit 6ab62fe7b6
115 changed files with 3613 additions and 2271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpc/test/helpers.go
+10 -9
View File
@@ -73,10 +73,13 @@ func CreateConfig(testName string) (*config.Config, error) {
type ServiceCloser func(context.Context) error
func StartTendermint(ctx context.Context,
func StartTendermint(
ctx context.Context,
conf *config.Config,
app abci.Application,
opts ...func(*Options)) (service.Service, ServiceCloser, error) {
opts ...func(*Options),
) (service.Service, ServiceCloser, error) {
ctx, cancel := context.WithCancel(ctx)
nodeOpts := &Options{}
for _, opt := range opts {
@@ -89,14 +92,14 @@ func StartTendermint(ctx context.Context,
logger = log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false)
}
papp := abciclient.NewLocalCreator(app)
tmNode, err := node.New(conf, logger, papp, nil)
tmNode, err := node.New(ctx, conf, logger, papp, nil)
if err != nil {
return nil, func(_ context.Context) error { return nil }, err
return nil, func(_ context.Context) error { cancel(); return nil }, err
}
err = tmNode.Start()
err = tmNode.Start(ctx)
if err != nil {
return nil, func(_ context.Context) error { return nil }, err
return nil, func(_ context.Context) error { cancel(); return nil }, err
}
waitForRPC(ctx, conf)
@@ -106,9 +109,7 @@ func StartTendermint(ctx context.Context,
}
return tmNode, func(ctx context.Context) error {
if err := tmNode.Stop(); err != nil {
logger.Error("Error when trying to stop node", "err", err)
}
cancel()
tmNode.Wait()
os.RemoveAll(conf.RootDir)
return nil