Revert "p2p: Fix "Unknown Channel" bug on CustomReactors (tendermint#6297)"

kostko · kostko · commit 234198c742b5 · 2021-04-09T14:16:36.000+02:00
This reverts commit c9966cd.
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
@@ -24,3 +24,4 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 
 ### BUG FIXES
 
+- [rpc/jsonrpc/server] \#6191 Correctly unmarshal `RPCRequest` when data is `null` (@melekes)
diff --git a/p2p/peer.go b/p2p/peer.go
@@ -130,15 +130,10 @@ func newPeer(
 	onPeerError func(Peer, interface{}),
 	options ...PeerOption,
 ) *peer {
-	var channs = make([]byte, 0, len(chDescs))
-	for _, desc := range chDescs {
-		channs = append(channs, desc.ID)
-	}
-
 	p := &peer{
 		peerConn:      pc,
 		nodeInfo:      nodeInfo,
-		channels:      channs,
+		channels:      nodeInfo.(DefaultNodeInfo).Channels, // TODO
 		Data:          cmap.NewCMap(),
 		metricsTicker: time.NewTicker(metricsTickerDuration),
 		metrics:       NopMetrics(),

Original file line number	Diff line number	Diff line change
`@@ -24,3 +24,4 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi`
`24`	`24`
`25`	`25`	`### BUG FIXES`
`26`	`26`
	`27`	+- [rpc/jsonrpc/server] \#6191 Correctly unmarshal `RPCRequest` when data is `null` (@melekes)