Skip to content

Commit

Permalink
fix: do not shadow clientCtx in start.go (#14086)
Browse files Browse the repository at this point in the history
(cherry picked from commit f96072d)

# Conflicts:
#	server/start.go
  • Loading branch information
julienrbrt authored and mergify[bot] committed Nov 30, 2022
1 parent 72699f7 commit 9998d4b
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions server/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,11 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App
// service if API or gRPC is enabled, and avoid doing so in the general
// case, because it spawns a new local tendermint RPC client.
if (config.API.Enable || config.GRPC.Enable) && tmNode != nil {
<<<<<<< HEAD
=======
// re-assign for making the client available below
// do not use := to avoid shadowing clientCtx
>>>>>>> f96072d9a (fix: do not shadow clientCtx in start.go (#14086))
clientCtx = clientCtx.WithClient(local.New(tmNode))

app.RegisterTxService(clientCtx)
Expand Down

0 comments on commit 9998d4b

Please sign in to comment.