Apply suggestions from code review

Co-authored-by: M. J. Fromberger <michael.j.fromberger@gmail.com>

internal/consensus/state.go

@@ -2087,12 +2087,10 @@ func (cs *State) defaultSetProposal(proposal *types.Proposal, recvTime time.Time
 	}
 
 	proposal.Signature = p.Signature
-	func() {
-		cs.mtx.Lock()
-		defer cs.mtx.RUnlock()
-		cs.Proposal = proposal
-		cs.ProposalReceiveTime = recvTime
-	}()
+	cs.mtx.Lock()
+	cs.Proposal = proposal
+	cs.ProposalReceiveTime = recvTime
+	cs.mtx.Unlock()
 	cs.calculateProposalTimestampDifferenceMetric()
 	// We don't update cs.ProposalBlockParts if it is already set.
 	// This happens if we're already in cstypes.RoundStepCommit or if there is a valid block in the current round.

node/node.go

@@ -470,8 +470,8 @@ func (n *nodeImpl) OnStart(ctx context.Context) error {
 		}
 	}
 
-	if n.config.Instrumentation.Prometheus && n.config.Instrumentation.PrometheusListenAddr != "" {
-		n.prometheusSrv = n.startPrometheusServer(ctx, n.config.Instrumentation.PrometheusListenAddr)
+	if p := n.config.Instrumentation; p.Prometheus && p.PrometheusListenAddr != "" {
+		n.prometheusSrv = n.startPrometheusServer(ctx, p.PrometheusListenAddr)
 	}
 
 	n.rpcEnv.NodeInfo = n.nodeInfo