mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-07 22:05:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

types: move NodeInfo from p2p (#6618)

Browse Source
This commit is contained in:
Sam Kleinman
2021-06-24 12:18:19 -04:00
committed by GitHub
parent 2cc872543b
commit 9ffa7e8a2b
28 changed files with 219 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node/node.go
View File

@@ -58,7 +58,7 @@ type nodeImpl struct {
peerManager *p2p.PeerManager
router *p2p.Router
addrBook pex.AddrBook // known peers
nodeInfo p2p.NodeInfo
nodeInfo types.NodeInfo
nodeKey p2p.NodeKey // our node privkey
isListening bool
@@ -1022,7 +1022,7 @@ func (n *nodeImpl) IsListening() bool {
}
// NodeInfo returns the Node's Info from the Switch.
func (n *nodeImpl) NodeInfo() p2p.NodeInfo {
func (n *nodeImpl) NodeInfo() types.NodeInfo {
return n.nodeInfo
}

38
node/setup.go
View File

@@ -537,7 +537,7 @@ func createPeerManager(
func createRouter(
p2pLogger log.Logger,
p2pMetrics *p2p.Metrics,
nodeInfo p2p.NodeInfo,
nodeInfo types.NodeInfo,
privKey crypto.PrivKey,
peerManager *p2p.PeerManager,
transport p2p.Transport,
@@ -565,7 +565,7 @@ func createSwitch(
consensusReactor *p2p.ReactorShim,
evidenceReactor *p2p.ReactorShim,
proxyApp proxy.AppConns,
nodeInfo p2p.NodeInfo,
nodeInfo types.NodeInfo,
nodeKey p2p.NodeKey,
p2pLogger log.Logger,
) *p2p.Switch {
@@ -713,7 +713,7 @@ func makeNodeInfo(
eventSinks []indexer.EventSink,
genDoc *types.GenesisDoc,
state sm.State,
) (p2p.NodeInfo, error) {
) (types.NodeInfo, error) {
txIndexerStatus := "off"
if indexer.IndexingEnabled(eventSinks) {
@@ -729,15 +729,15 @@ func makeNodeInfo(
bcChannel = bcv2.BlockchainChannel
default:
return p2p.NodeInfo{}, fmt.Errorf("unknown fastsync version %s", config.FastSync.Version)
return types.NodeInfo{}, fmt.Errorf("unknown fastsync version %s", config.FastSync.Version)
}
nodeInfo := p2p.NodeInfo{
ProtocolVersion: p2p.NewProtocolVersion(
version.P2PProtocol, // global
state.Version.Consensus.Block,
state.Version.Consensus.App,
),
nodeInfo := types.NodeInfo{
ProtocolVersion: types.ProtocolVersion{
P2P: version.P2PProtocol, // global
Block: state.Version.Consensus.Block,
App: state.Version.Consensus.App,
},
NodeID: nodeKey.ID,
Network: genDoc.ChainID,
Version: version.TMVersion,
@@ -754,7 +754,7 @@ func makeNodeInfo(
byte(statesync.LightBlockChannel),
},
Moniker: config.Moniker,
Other: p2p.NodeInfoOther{
Other: types.NodeInfoOther{
TxIndex: txIndexerStatus,
RPCAddress: config.RPC.ListenAddress,
},
@@ -781,19 +781,19 @@ func makeSeedNodeInfo(
nodeKey p2p.NodeKey,
genDoc *types.GenesisDoc,
state sm.State,
) (p2p.NodeInfo, error) {
nodeInfo := p2p.NodeInfo{
ProtocolVersion: p2p.NewProtocolVersion(
version.P2PProtocol, // global
state.Version.Consensus.Block,
state.Version.Consensus.App,
),
) (types.NodeInfo, error) {
nodeInfo := types.NodeInfo{
ProtocolVersion: types.ProtocolVersion{
P2P: version.P2PProtocol, // global
Block: state.Version.Consensus.Block,
App: state.Version.Consensus.App,
},
NodeID: nodeKey.ID,
Network: genDoc.ChainID,
Version: version.TMVersion,
Channels: []byte{},
Moniker: config.Moniker,
Other: p2p.NodeInfoOther{
Other: types.NodeInfoOther{
TxIndex: "off",
RPCAddress: config.RPC.ListenAddress,
},