mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-04 11:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bucky/abci-11

Browse Source
This commit is contained in:
Ethan Buchman
2018-06-01 21:16:05 -04:00
parent 4e51e4775c f34d1009c4
commit 7c9fbadd97
15 changed files with 24 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node/node.go
View File

@@ -269,9 +269,6 @@ func NewNode(config *cfg.Config,
// but it would still be nice to have a clear list of the current "PersistentPeers"
// somewhere that we can return with net_info.
//
// Let's assume we always have IDs ... and we just dont authenticate them
// if auth_enc=false.
//
// If PEX is on, it should handle dialing the seeds. Otherwise the switch does it.
// Note we currently use the addrBook regardless at least for AddOurAddress
addrBook := pex.NewAddrBook(config.P2P.AddrBookFile(), config.P2P.AddrBookStrict)