Skip to content

Commit bfef079

Browse files
committed
Make route_handler and chan_handler Option<>al in MessageHandler
We currently "support" not having a router or channel in memory by forcing users to implement the handler trait and ignore every message. Instead, we can just do that ourselves to simplify the API.
1 parent 9fba7c9 commit bfef079

File tree

2 files changed

+238
-87
lines changed

2 files changed

+238
-87
lines changed

lightning-net-tokio/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,8 @@ mod tests {
600600
msg_events: Mutex::new(Vec::new()),
601601
});
602602
let a_manager = Arc::new(PeerManager::new(MessageHandler {
603-
chan_handler: Arc::clone(&a_handler),
604-
route_handler: Arc::clone(&a_handler),
603+
chan_handler: Some(Arc::clone(&a_handler)),
604+
route_handler: Some(Arc::clone(&a_handler)),
605605
}, a_key.clone(), &[1; 32], Arc::new(TestLogger())));
606606

607607
let (b_connected_sender, mut b_connected) = mpsc::channel(1);
@@ -614,8 +614,8 @@ mod tests {
614614
msg_events: Mutex::new(Vec::new()),
615615
});
616616
let b_manager = Arc::new(PeerManager::new(MessageHandler {
617-
chan_handler: Arc::clone(&b_handler),
618-
route_handler: Arc::clone(&b_handler),
617+
chan_handler: Some(Arc::clone(&b_handler)),
618+
route_handler: Some(Arc::clone(&b_handler)),
619619
}, b_key.clone(), &[2; 32], Arc::new(TestLogger())));
620620

621621
// We bind on localhost, hoping the environment is properly configured with a local

0 commit comments

Comments
 (0)