From fe09d7454528f72583949ef4e0fbc1e26d956900 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Fri, 18 Feb 2022 13:37:17 -0500
Subject: [PATCH] merge fix

---
 internal/consensus/metrics.go | 21 ++-------------------
 internal/consensus/state.go   | 10 +---------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/internal/consensus/metrics.go b/internal/consensus/metrics.go
index 15feee0c6..2ab8f9411 100644
--- a/internal/consensus/metrics.go
+++ b/internal/consensus/metrics.go
@@ -6,11 +6,7 @@ import (
 
 	"github.com/go-kit/kit/metrics"
 	"github.com/go-kit/kit/metrics/discard"
-<<<<<<< HEAD
-=======
-
 	cstypes "github.com/tendermint/tendermint/internal/consensus/types"
->>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
 	"github.com/tendermint/tendermint/types"
 
 	prometheus "github.com/go-kit/kit/metrics/prometheus"
@@ -294,7 +290,6 @@ func NopMetrics() *Metrics {
 
 		BlockIntervalSeconds: discard.NewHistogram(),
 
-<<<<<<< HEAD
 		NumTxs:                    discard.NewGauge(),
 		BlockSizeBytes:            discard.NewHistogram(),
 		TotalTxs:                  discard.NewGauge(),
@@ -302,22 +297,10 @@ func NopMetrics() *Metrics {
 		BlockSyncing:              discard.NewGauge(),
 		StateSyncing:              discard.NewGauge(),
 		BlockParts:                discard.NewCounter(),
+		BlockGossipReceiveLatency: discard.NewHistogram(),
+		BlockGossipPartsReceived:  discard.NewCounter(),
 		QuorumPrevoteMessageDelay: discard.NewGauge(),
 		FullPrevoteMessageDelay:   discard.NewGauge(),
-=======
-		NumTxs:                      discard.NewGauge(),
-		BlockSizeBytes:              discard.NewHistogram(),
-		TotalTxs:                    discard.NewGauge(),
-		CommittedHeight:             discard.NewGauge(),
-		BlockSyncing:                discard.NewGauge(),
-		StateSyncing:                discard.NewGauge(),
-		BlockParts:                  discard.NewCounter(),
-		BlockGossipReceiveLatency:   discard.NewHistogram(),
-		BlockGossipPartsReceived:    discard.NewCounter(),
-		QuorumPrevoteMessageDelay:   discard.NewGauge(),
-		FullPrevoteMessageDelay:     discard.NewGauge(),
-		ProposalTimestampDifference: discard.NewHistogram(),
->>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
 	}
 }
 
diff --git a/internal/consensus/state.go b/internal/consensus/state.go
index a9eb8dd46..3632957f2 100644
--- a/internal/consensus/state.go
+++ b/internal/consensus/state.go
@@ -1880,12 +1880,8 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID types.NodeID
 
 	// Blocks might be reused, so round mismatch is OK
 	if cs.Height != height {
-<<<<<<< HEAD
 		cs.Logger.Debug("received block part from wrong height", "height", height, "round", round)
-=======
-		cs.logger.Debug("received block part from wrong height", "height", height, "round", round)
 		cs.metrics.BlockGossipPartsReceived.With("matches_current", "false").Add(1)
->>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
 		return false, nil
 	}
 
@@ -1920,12 +1916,8 @@ func (cs *State) addProposalBlockPart(msg *BlockPartMessage, peerID types.NodeID
 		)
 	}
 	if added && cs.ProposalBlockParts.IsComplete() {
-<<<<<<< HEAD
-		bz, err := ioutil.ReadAll(cs.ProposalBlockParts.GetReader())
-=======
 		cs.metrics.MarkBlockGossipComplete()
-		bz, err := io.ReadAll(cs.ProposalBlockParts.GetReader())
->>>>>>> 165cc2947 (consensus: additional timing metrics (#7849))
+		bz, err := ioutil.ReadAll(cs.ProposalBlockParts.GetReader())
 		if err != nil {
 			return added, err
 		}