fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-26 07:12:16 +00:00
Code Issues Projects Releases Wiki Activity

p2p: add RPCAddress to NodeInfoOther.String() (#2442)

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

Refs #2433
This commit is contained in:
Anton Kaliaev 2018-09-19 17:54:14 +04:00 committed by Alexander Simmerl
parent c0cdb9d441
commit aa5495f24e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/node.go
View File

@ -775,6 +775,7 @@ func makeNodeInfo(
ConsensusVersion: cs.Version, ConsensusVersion: cs.Version,
RPCVersion: fmt.Sprintf("%v/%v", rpc.Version, rpccore.Version), RPCVersion: fmt.Sprintf("%v/%v", rpc.Version, rpccore.Version),
TxIndex: txIndexerStatus, TxIndex: txIndexerStatus,
RPCAddress: config.RPC.ListenAddress,
}, },
} }
@ -782,9 +783,6 @@ func makeNodeInfo(
nodeInfo.Channels = append(nodeInfo.Channels, pex.PexChannel) nodeInfo.Channels = append(nodeInfo.Channels, pex.PexChannel)
} }
rpcListenAddr := config.RPC.ListenAddress
nodeInfo.Other.RPCAddress = rpcListenAddr
lAddr := config.P2P.ExternalAddress lAddr := config.P2P.ExternalAddress
if lAddr == "" { if lAddr == "" {

4
p2p/node_info.go
View File

@ -48,12 +48,13 @@ type NodeInfoOther struct {
func (o NodeInfoOther) String() string { func (o NodeInfoOther) String() string {
return fmt.Sprintf( 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.AminoVersion,
o.P2PVersion, o.P2PVersion,
o.ConsensusVersion, o.ConsensusVersion,
o.RPCVersion, o.RPCVersion,
o.TxIndex, o.TxIndex,
o.RPCAddress,
) )
} }
@ -84,7 +85,6 @@ func (info NodeInfo) Validate() error {
// XXX: Should we be more strict about version and address formats? // XXX: Should we be more strict about version and address formats?
other := info.Other other := info.Other
versions := []string{ versions := []string{
other.AminoVersion,
other.AminoVersion, other.AminoVersion,
other.P2PVersion, other.P2PVersion,
other.ConsensusVersion, other.ConsensusVersion,