From ccf53a22760c92a02f1f20ed24a7ec9f510d7c5d Mon Sep 17 00:00:00 2001
From: Tess Rinearson <tess.rinearson@gmail.com>
Date: Fri, 27 Mar 2020 18:30:42 +0100
Subject: [PATCH] all: name reactors when they are initialized (#4608)

Previously, many reactors were initialized with the name "Reactor," which made it difficult to log which reactor was doing what. This changes those reactors' names to something more descriptive.
---
 CHANGELOG_PENDING.md   | 1 +
 consensus/reactor.go   | 2 +-
 evidence/reactor.go    | 2 +-
 mempool/reactor.go     | 2 +-
 p2p/mock/reactor.go    | 2 +-
 p2p/pex/pex_reactor.go | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 5e3dc64b0..44354b5c6 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -22,6 +22,7 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 - [privval] \#4534 Add `error` as a return value on`GetPubKey()`
 - [Docker] \#4569 Default configuration added to docker image (you can still mount your own config the same way) (@greg-szabo)
 - [lite2] [\#4562](https://github.com/tendermint/tendermint/pull/4562) Cache headers when using bisection (@cmwaters)
+- [all] [\4608](https://github.com/tendermint/tendermint/pull/4608) Give reactors descriptive names when they're initialized
 
 ### BUG FIXES:
 
diff --git a/consensus/reactor.go b/consensus/reactor.go
index 61e46c7c4..3182bba89 100644
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -58,7 +58,7 @@ func NewReactor(consensusState *State, fastSync bool, options ...ReactorOption)
 		metrics:  NopMetrics(),
 	}
 	conR.updateFastSyncingMetric()
-	conR.BaseReactor = *p2p.NewBaseReactor("Reactor", conR)
+	conR.BaseReactor = *p2p.NewBaseReactor("Consensus", conR)
 
 	for _, option := range options {
 		option(conR)
diff --git a/evidence/reactor.go b/evidence/reactor.go
index 19ad0f135..e4dbd51ad 100644
--- a/evidence/reactor.go
+++ b/evidence/reactor.go
@@ -34,7 +34,7 @@ func NewReactor(evpool *Pool) *Reactor {
 	evR := &Reactor{
 		evpool: evpool,
 	}
-	evR.BaseReactor = *p2p.NewBaseReactor("Reactor", evR)
+	evR.BaseReactor = *p2p.NewBaseReactor("Evidence", evR)
 	return evR
 }
 
diff --git a/mempool/reactor.go b/mempool/reactor.go
index 161fc7212..1ae3592a0 100644
--- a/mempool/reactor.go
+++ b/mempool/reactor.go
@@ -110,7 +110,7 @@ func NewReactor(config *cfg.MempoolConfig, mempool *CListMempool) *Reactor {
 		mempool: mempool,
 		ids:     newMempoolIDs(),
 	}
-	memR.BaseReactor = *p2p.NewBaseReactor("Reactor", memR)
+	memR.BaseReactor = *p2p.NewBaseReactor("Mempool", memR)
 	return memR
 }
 
diff --git a/p2p/mock/reactor.go b/p2p/mock/reactor.go
index cfce12bd1..40f918e9f 100644
--- a/p2p/mock/reactor.go
+++ b/p2p/mock/reactor.go
@@ -12,7 +12,7 @@ type Reactor struct {
 
 func NewReactor() *Reactor {
 	r := &Reactor{}
-	r.BaseReactor = *p2p.NewBaseReactor("Reactor", r)
+	r.BaseReactor = *p2p.NewBaseReactor("Mock-PEX", r)
 	r.SetLogger(log.TestingLogger())
 	return r
 }
diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go
index b0aafe0be..192e75fa1 100644
--- a/p2p/pex/pex_reactor.go
+++ b/p2p/pex/pex_reactor.go
@@ -141,7 +141,7 @@ func NewReactor(b AddrBook, config *ReactorConfig) *Reactor {
 		lastReceivedRequests: cmap.NewCMap(),
 		crawlPeerInfos:       make(map[p2p.ID]crawlPeerInfo),
 	}
-	r.BaseReactor = *p2p.NewBaseReactor("Reactor", r)
+	r.BaseReactor = *p2p.NewBaseReactor("PEX", r)
 	return r
 }