From aa5495f24e17c72d49a58ac0682d9f9011cb66d3 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Wed, 19 Sep 2018 17:54:14 +0400
Subject: [PATCH] p2p: add RPCAddress to NodeInfoOther.String() (#2442)

- remove second AminoVersion from
https://github.com/tendermint/tendermint/pull/2426/files#diff-f2fefc7a06ea0d1e0a910196901e50aaR86

Refs #2433
---
 node/node.go     | 4 +---
 p2p/node_info.go | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/node/node.go b/node/node.go
index f3dcadf9..1061fbf7 100644
--- a/node/node.go
+++ b/node/node.go
@@ -775,6 +775,7 @@ func makeNodeInfo(
 			ConsensusVersion: cs.Version,
 			RPCVersion:       fmt.Sprintf("%v/%v", rpc.Version, rpccore.Version),
 			TxIndex:          txIndexerStatus,
+			RPCAddress:       config.RPC.ListenAddress,
 		},
 	}
 
@@ -782,9 +783,6 @@ func makeNodeInfo(
 		nodeInfo.Channels = append(nodeInfo.Channels, pex.PexChannel)
 	}
 
-	rpcListenAddr := config.RPC.ListenAddress
-	nodeInfo.Other.RPCAddress = rpcListenAddr
-
 	lAddr := config.P2P.ExternalAddress
 
 	if lAddr == "" {
diff --git a/p2p/node_info.go b/p2p/node_info.go
index a0df3d37..a1653594 100644
--- a/p2p/node_info.go
+++ b/p2p/node_info.go
@@ -48,12 +48,13 @@ type NodeInfoOther struct {
 
 func (o NodeInfoOther) String() string {
 	return fmt.Sprintf(
-		"{amino_version: %v, p2p_version: %v, consensus_version: %v, rpc_version: %v, tx_index: %v}",
+		"{amino_version: %v, p2p_version: %v, consensus_version: %v, rpc_version: %v, tx_index: %v, rpc_address: %v}",
 		o.AminoVersion,
 		o.P2PVersion,
 		o.ConsensusVersion,
 		o.RPCVersion,
 		o.TxIndex,
+		o.RPCAddress,
 	)
 }
 
@@ -84,7 +85,6 @@ func (info NodeInfo) Validate() error {
 	// XXX: Should we be more strict about version and address formats?
 	other := info.Other
 	versions := []string{
-		other.AminoVersion,
 		other.AminoVersion,
 		other.P2PVersion,
 		other.ConsensusVersion,