Add tests for routing message handler #570

naumenkogs · 2020-04-02T18:59:09Z

Addressing the issue #524

TheBlueMatt

This looks good as-is (there's always more to test, but this is a nice start), let me know if you plan on adding more stuff (since its tagged WIP) or if you want this to be merged. An obvious additional test may be testing that excess_data results in the announcement(s) being accepted, but not relayed (ie Ok(false) as a return value).

naumenkogs · 2020-04-03T19:53:50Z

@TheBlueMatt I want to do all routing handlers within this PR. I'll let you know once it's fully ready for review!

naumenkogs · 2020-04-04T22:01:29Z

@TheBlueMatt ready for review! I left some questions along my tests.

Answering those would help me to get better intuition on the current state of the repo and approaches to things, so I'd be grateful.

TheBlueMatt

Glad this is getting some testing, but it seems a bunch of the internal state modifications are causing invalid states, which leave your comments that panics shoulnd't occur.

lightning/src/ln/router.rs

codecov · 2020-04-06T23:49:43Z

Codecov Report

❗ No coverage uploaded for pull request base (master@60dd37d). Click here to learn what that means.
The diff coverage is n/a.

naumenkogs · 2020-04-06T23:50:07Z

@TheBlueMatt I think I addressed all your comments.
Sorry in advance for the formatting issues: still getting used to tabs.

lightning/src/ln/router.rs

TheBlueMatt

Looks good. One comment, though.

lightning/src/ln/router.rs

naumenkogs · 2020-04-07T23:04:55Z

Done!

TheBlueMatt

Looks good. The comments are mostly all nits, so you're welcome to chose to ignore some, but get_next_channel_announcements probably doesn't make sense as-is.

lightning/src/ln/router.rs

TheBlueMatt · 2020-04-09T01:28:51Z

lightning/src/ln/router.rs

+			let network = router.network_map.write().unwrap();
+			assert_eq!(network.channels.len(), 0);
+			// Nodes are also deleted because there are no associated channels anymore
+			assert_eq!(network.nodes.len(), 1);


Wait, why does it end with 1? (and maybe test that it starts with 1 at the top).

This is "our" node, the one we initiate a router with.

Should add an assert at the top of the test + a comment indicating that, I think.

TheBlueMatt · 2020-04-09T03:48:18Z

lightning/src/ln/router.rs

+		}
+
+		// No updates.
+		let next_announcements = router.get_next_channel_announcements(channel_key, 2);


Oops. I actually think this is a bug, and have a commit to fix it that I haven't gotten around to PR'ing yet.

Alright, so should we wait when you merge that first then?

Up to you. You're welcome to take the top commit from https://github.com/TheBlueMatt/rust-lightning/tree/2020-04-relay-no-node in this PR or I can do it separately and you can drop the relevant commit from this PR.

TheBlueMatt · 2020-04-09T03:48:36Z

lightning/src/ln/router.rs

+			};
+		}
+
+		// Updates with empty messages are not returned.


naumenkogs · 2020-04-10T13:55:19Z

@TheBlueMatt Addressed latest suggestions!

TheBlueMatt

Nice! Travis found that a few spots don't compile with older rustcs that we support (I suggested changes that I think will fix it, but no guarantees).

TheBlueMatt · 2020-04-10T19:40:39Z

lightning/src/ln/router.rs

+			let (_, update_1, update_2) = channel_announcements;
+			assert_ne!(update_1.clone(), None);
+			assert_eq!(update_2.clone(), None);


Suggested change

let (_, update_1, update_2) = channel_announcements;

assert_ne!(update_1.clone(), None);

assert_eq!(update_2.clone(), None);

let &(_, ref update_1, ref update_2) = channel_announcements;

assert_ne!(update_1, &None);

assert_eq!(update_2, &None);

TheBlueMatt · 2020-04-10T19:41:15Z

lightning/src/ln/router.rs

+			let (_, update_1, update_2) = channel_announcements;
+			assert_eq!(update_1.clone(), None);
+			assert_eq!(update_2.clone(), None);


Suggested change

let (_, update_1, update_2) = channel_announcements;

assert_eq!(update_1.clone(), None);

assert_eq!(update_2.clone(), None);

let &(_, ref update_1, ref update_2) = channel_announcements;

assert_eq!(update_1, &None);

assert_eq!(update_2, &None);

TheBlueMatt · 2020-04-10T19:41:52Z

lightning/src/ln/router.rs

+			let (_, update_1, update_2) = channel_announcements;
+			assert_eq!(update_1.clone(), None);
+			assert_eq!(update_2.clone(), None);


Suggested change

let (_, update_1, update_2) = channel_announcements;

assert_eq!(update_1.clone(), None);

assert_eq!(update_2.clone(), None);

let &(_, ref update_1, ref update_2) = channel_announcements;

assert_eq!(update_1, &None);

assert_eq!(update_2, &None);

TheBlueMatt · 2020-04-10T19:44:26Z

Also needs rebase on master.

naumenkogs · 2020-04-11T13:00:25Z

@TheBlueMatt done. Thanks for patience :)

TheBlueMatt · 2020-04-11T18:30:57Z

Oops, I had the github settings set wrong, turns out didn't need a rebase. Anyway, looks great!

naumenkogs changed the title ~~WIP: Add tests for handling node announcements~~ WIP: Add tests for routing message handler Apr 2, 2020

TheBlueMatt approved these changes Apr 3, 2020

View reviewed changes

naumenkogs changed the title ~~WIP: Add tests for routing message handler~~ Add tests for routing message handler Apr 4, 2020

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch from e807e87 to b1bafd0 Compare April 4, 2020 22:01

TheBlueMatt reviewed Apr 6, 2020

View reviewed changes

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch from b1bafd0 to 1690c40 Compare April 6, 2020 23:49

naumenkogs commented Apr 7, 2020

View reviewed changes

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

TheBlueMatt reviewed Apr 7, 2020

View reviewed changes

lightning/src/ln/router.rs Outdated Show resolved Hide resolved

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch from 1690c40 to 14d10e5 Compare April 7, 2020 23:02

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch from 14d10e5 to f9f90e9 Compare April 7, 2020 23:04

TheBlueMatt reviewed Apr 9, 2020

View reviewed changes

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch 3 times, most recently from 80e676e to 82c5995 Compare April 10, 2020 13:55

TheBlueMatt reviewed Apr 10, 2020

View reviewed changes

naumenkogs and others added 7 commits April 11, 2020 08:30

Add tests for handling node announcements

fce5c15

Allow relaying of only one direction in a channel, log on recv

c59468a

Add tests for handling channel announcements

37f0c1a

Add tests for handling channel updates

1da1ffa

Add tests for handling htlc fail channel updates

c8a1460

Add tests for getting next channel announcements

4258750

Add tests for getting node announcements

79c8491

naumenkogs force-pushed the 2020_04_routing_message_handler_tests branch from 82c5995 to 79c8491 Compare April 11, 2020 13:00

TheBlueMatt merged commit c9c9415 into lightningdevkit:master Apr 11, 2020

naumenkogs deleted the 2020_04_routing_message_handler_tests branch April 11, 2020 21:28

naumenkogs restored the 2020_04_routing_message_handler_tests branch April 11, 2020 21:28

jkczyz mentioned this pull request Apr 16, 2020

RoutingMessageHandler tests for Router #524

Closed

TheBlueMatt mentioned this pull request Apr 29, 2020

Separate route calculating from network message handlers #592

Closed

2 tasks

Add tests for routing message handler #570

Add tests for routing message handler #570

Conversation

naumenkogs commented Apr 2, 2020

Uh oh!

TheBlueMatt left a comment

Choose a reason for hiding this comment

Uh oh!

naumenkogs commented Apr 3, 2020

Uh oh!

naumenkogs commented Apr 4, 2020

Uh oh!

TheBlueMatt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

naumenkogs commented Apr 6, 2020

Uh oh!

Uh oh!

TheBlueMatt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

naumenkogs commented Apr 7, 2020

Uh oh!

TheBlueMatt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naumenkogs Apr 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

naumenkogs commented Apr 10, 2020

Uh oh!

TheBlueMatt left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

TheBlueMatt commented Apr 10, 2020

Uh oh!

naumenkogs commented Apr 11, 2020

Uh oh!

TheBlueMatt commented Apr 11, 2020

Uh oh!

Uh oh!

codecov bot commented Apr 6, 2020 •

edited

Loading

naumenkogs Apr 9, 2020 •

edited

Loading