Skip to content

Commit b83c7d4

Browse files
committed
f - return Result from MessageRouter::find_route
1 parent 970abfd commit b83c7d4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

fuzz/src/onion_message.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ pub extern "C" fn onion_message_run(data: *const u8, datalen: usize) {
5858
struct TestMessageRouter {}
5959

6060
impl MessageRouter for TestMessageRouter {
61-
fn find_route(&self, _sender: &PublicKey, _destination: &Destination) -> Option<Vec<PublicKey>> {
61+
fn find_route(
62+
&self, _sender: &PublicKey, _destination: &Destination
63+
) -> Result<Vec<PublicKey>, ()> {
6264
unreachable!()
6365
}
6466
}

lightning/src/onion_message/functional_tests.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ impl MessengerNode {
4848
struct TestMessageRouter {}
4949

5050
impl MessageRouter for TestMessageRouter {
51-
fn find_route(&self, _sender: &PublicKey, _destination: &Destination) -> Option<Vec<PublicKey>> {
51+
fn find_route(
52+
&self, _sender: &PublicKey, _destination: &Destination
53+
) -> Result<Vec<PublicKey>, ()> {
5254
todo!()
5355
}
5456
}

lightning/src/onion_message/messenger.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use crate::prelude::*;
5858
/// # }
5959
/// # struct FakeMessageRouter {}
6060
/// # impl MessageRouter for FakeMessageRouter {
61-
/// # fn find_route(&self, sender: &PublicKey, destination: &Destination) -> Option<Vec<PublicKey>> {
61+
/// # fn find_route(&self, sender: &PublicKey, destination: &Destination) -> Result<Vec<PublicKey>, ()> {
6262
/// # unimplemented!()
6363
/// # }
6464
/// # }
@@ -145,7 +145,9 @@ pub trait MessageRouter {
145145
/// This should include only intermediate nodes between `sender` and `destination`.
146146
///
147147
/// [`OnionMessage`]: msgs::OnionMessage
148-
fn find_route(&self, sender: &PublicKey, destination: &Destination) -> Option<Vec<PublicKey>>;
148+
fn find_route(
149+
&self, sender: &PublicKey, destination: &Destination
150+
) -> Result<Vec<PublicKey>, ()>;
149151
}
150152

151153
/// The destination of an onion message.

0 commit comments

Comments
 (0)