fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-22 17:31:34 +00:00
Code Issues Projects Releases Wiki Activity

makeNodeInfo returns error (#3029)

Browse Source 
* makeNodeInfo returns error

* version and changelog
This commit is contained in:
Ethan Buchman
2018-12-16 14:05:58 -05:00
committed by GitHub
parent 9a6dd96cba
commit b3141d7d02
4 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
node/node.go
View File

@ -348,20 +348,21 @@ func NewNode(config *cfg.Config,
indexerService := txindex.NewIndexerService(txIndexer, eventBus)
indexerService.SetLogger(logger.With("module", "txindex"))
var (
p2pLogger = logger.With("module", "p2p")
nodeInfo = makeNodeInfo(
config,
nodeKey.ID(),
txIndexer,
genDoc.ChainID,
p2p.NewProtocolVersion(
version.P2PProtocol, // global
state.Version.Consensus.Block,
state.Version.Consensus.App,
),
)
p2pLogger := logger.With("module", "p2p")
nodeInfo, err := makeNodeInfo(
config,
nodeKey.ID(),
txIndexer,
genDoc.ChainID,
p2p.NewProtocolVersion(
version.P2PProtocol, // global
state.Version.Consensus.Block,
state.Version.Consensus.App,
),
)
if err != nil {
return nil, err
}
// Setup Transport.
var (
@ -782,7 +783,7 @@ func makeNodeInfo(
txIndexer txindex.TxIndexer,
chainID string,
protocolVersion p2p.ProtocolVersion,
) p2p.NodeInfo {
) (p2p.NodeInfo, error) {
txIndexerStatus := "on"
if _, ok := txIndexer.(*null.TxIndex); ok {
txIndexerStatus = "off"
@ -818,11 +819,7 @@ func makeNodeInfo(
nodeInfo.ListenAddr = lAddr
err := nodeInfo.Validate()
if err != nil {
panic(err)
}
return nodeInfo
return nodeInfo, err
}
//------------------------------------------------------------------------------