DRY make_event_loop

This commit is contained in:
decentclock
2022-08-02 13:04:19 -06:00
parent 5c21f5071f
commit 46b10cdfc9
2 changed files with 2 additions and 3 deletions

View File

@@ -41,7 +41,6 @@ pub fn make_event_loop(
network: Network, network: Network,
do_log: bool, do_log: bool,
led_tx: mpsc::Sender<Status>, led_tx: mpsc::Sender<Status>,
seed: [u8; 32],
config: Config config: Config
) -> Result<()> { ) -> Result<()> {
while let Ok(event) = rx.recv() { while let Ok(event) = rx.recv() {
@@ -65,7 +64,7 @@ pub fn make_event_loop(
} }
// initialize the RootHandler // initialize the RootHandler
let init_msg = make_init_msg(network, seed).expect("failed to make init msg"); let init_msg = make_init_msg(network, config.seed).expect("failed to make init msg");
let InitResponse { let InitResponse {
root_handler, root_handler,
init_reply: _, init_reply: _,

View File

@@ -85,7 +85,7 @@ fn main() -> Result<()> {
log::info!("Network set to {:?}", network); log::info!("Network set to {:?}", network);
log::info!(">>>>>>>>>>> blocking forever..."); log::info!(">>>>>>>>>>> blocking forever...");
log::info!("{:?}", exist); log::info!("{:?}", exist);
make_event_loop(mqtt_client, rx, network, do_log, led_tx, exist.seed, exist)?; make_event_loop(mqtt_client, rx, network, do_log, led_tx, exist)?;
} else { } else {
led_tx.send(Status::WifiAccessPoint).unwrap(); led_tx.send(Status::WifiAccessPoint).unwrap();
println!("=============> START SERVER NOW AND WAIT <=============="); println!("=============> START SERVER NOW AND WAIT <==============");