octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow using the connect stub to test address messages.

This commit is contained in:
Henry de Valence 2019-11-13 14:40:06 -08:00 committed by Deirdre Connolly
parent 2ac77ab704
commit ec4f6bd9ea
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zebrad/src/commands/connect.rs
View File

@ -21,31 +21,13 @@ impl Runnable for ConnectCmd {
info!(connect.addr = ?self.addr); info!(connect.addr = ?self.addr);
use crate::components::tokio::TokioComponent; use crate::components::tokio::TokioComponent;
let wait = tokio::future::pending::<()>();
// Combine the connect future with an infinite wait
// so that the program has to be explicitly killed and
// won't die before all tracing messages are written.
let fut = futures::future::join(
async {
match self.connect().await {
Ok(()) => {}
Err(e) => {
// Print any error that occurs.
error!(?e);
}
}
},
wait,
);
let _ = app_reader() let _ = app_reader()
.state() .state()
.components .components
.get_downcast_ref::<TokioComponent>() .get_downcast_ref::<TokioComponent>()
.expect("TokioComponent should be available") .expect("TokioComponent should be available")
.rt .rt
.block_on(fut); .block_on(self.connect());
} }
} }
@ -66,7 +48,11 @@ impl ConnectCmd {
1, 1,
); );
let config = app_config().network.clone(); let mut config = app_config().network.clone();
// Use a different listen addr so that we don't conflict with another local node.
config.listen_addr = "127.0.0.1:38233".parse().unwrap();
// Connect only to the specified peer.
config.initial_mainnet_peers = vec![self.addr.to_string()];
let (mut peer_set, address_book) = zebra_network::init(config, node).await; let (mut peer_set, address_book) = zebra_network::init(config, node).await;