kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-05-25 00:33:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

pass ongoing p2p conversations to http handler, so we can handle /v2/neighbors

Browse Source
This commit is contained in:
Jude Nelson
2020-05-17 22:24:01 -04:00
parent 2632e108b5
commit 28eefb62ce
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/p2p.rs
View File

@@ -259,6 +259,8 @@ pub enum PeerNetworkWorkState {
Prune
}
pub type PeerMap = HashMap<usize, ConversationP2P>;
pub struct PeerNetwork {
pub local_peer: LocalPeer,
pub peer_version: u32,
@@ -267,7 +269,7 @@ pub struct PeerNetwork {
pub peerdb: PeerDB,
// ongoing p2p conversations (either they reached out to us, or we to them)
pub peers: HashMap<usize, ConversationP2P>,
pub peers: PeerMap,
pub sockets: HashMap<usize, mio_net::TcpStream>,
pub events: HashMap<NeighborKey, usize>,
pub connecting: HashMap<usize, (mio_net::TcpStream, bool, u64)>, // (socket, outbound?, connection sent)
@@ -334,7 +336,7 @@ impl PeerNetwork {
peerdb: peerdb,
peers: HashMap::new(),
peers: PeerMap::new(),
sockets: HashMap::new(),
events: HashMap::new(),
connecting: HashMap::new(),
@@ -555,7 +557,7 @@ impl PeerNetwork {
}
/// Count how many outbound conversations are going on
pub fn count_outbound_conversations(peers: &HashMap<usize, ConversationP2P>) -> u64 {
pub fn count_outbound_conversations(peers: &PeerMap) -> u64 {
let mut ret = 0;
for (_, convo) in peers.iter() {
if convo.stats.outbound {
@@ -2235,7 +2237,7 @@ impl PeerNetwork {
let mut result = NetworkResult::new();
PeerNetwork::with_network_state(self, |ref mut network, ref mut network_state| {
let http_stacks_msgs = network.http.run(network_state, network.chain_view.clone(), burndb, &mut network.peerdb, chainstate, mempool, http_poll_state)?;
let http_stacks_msgs = network.http.run(network_state, network.chain_view.clone(), &network.peers, burndb, &network.peerdb, chainstate, mempool, http_poll_state)?;
result.consume_http_uploads(http_stacks_msgs);
Ok(())
})?;