Skip to content

Genericize Test Functions - #2177

Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged

Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-04-test-function-generics

Conversation

@TheBlueMatt

@TheBlueMattTheBlueMatt commented Apr 12, 2023

Copy link
Copy Markdown
Collaborator

This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.

@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt changed the title 2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt

TheBlueMatt commented Apr 12, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Assigning val and wilmer cause y'all are already on 2111.

@TheBlueMattTheBlueMatt added this to the 0.0.115 milestone Apr 12, 2023
valentinewallace
valentinewallace reviewed Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
&'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
&'a test_utils::TestLogger>;

struct ANodeHolder<'a, P: Persist<InMemorySigner>> {

@valentinewallacevalentinewallaceApr 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?

@TheBlueMattTheBlueMattApr 12, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.

Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed the 2023-04-test-function-generics branch from 1be3caf to db9cd01CompareApril 12, 2023 20:03
@codecov-commenter

codecov-commenter commented Apr 12, 2023•
edited by codecov Bot
Loading

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

valentinewallace
valentinewallace reviewed Apr 13, 2023
View reviewed changes

@valentinewallacevalentinewallace left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look

Comment threadlightning/src/ln/functional_test_utils.rs Outdated
@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed the 2023-04-test-function-generics branch from db9cd01 to cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt

TheBlueMatt commented Apr 13, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Squashed with typo fixes:

$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino merged commit 1505089 into lightningdevkit:mainApr 17, 2023
@tnulltnull mentioned this pull request Apr 18, 2023
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino

@valentinewallacevalentinewallace

Labels

None yet

Projects

None yet

Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Genericize Test Functions by TheBlueMatt · Pull Request #2177 · lightningdevkit/rust-lightning · GitHub
Skip to content
Genericize Test Functions - #2177
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Apr 17, 2023
Merged
Genericize Test Functions#2177
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2023-04-test-function-generics
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

Collaborator
This is the prefactors from #2111 which just set us up to have more functions in testing, avoiding more macros in tests.
@TheBlueMatt
DRY the event handling in ChannelManager
fb86fc2
In the coming commits we'll add some additional complexity to the
event handling flows, so best to DRY them up before we get there.
@TheBlueMattTheBlueMatt
changed the title
2023 04 test function genericsGenericize Test FunctionsApr 12, 2023
@TheBlueMatt
TheBlueMatt
commented
Apr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Assigning val and wilmer cause y'all are already on 2111.
@TheBlueMattTheBlueMatt
added this to the 0.0.115 milestone
Apr 12, 2023
valentinewallace
valentinewallace
reviewed
Apr 12, 2023
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
 &'a test_utils::TestFeeEstimator, &'a test_utils::TestRouter<'a>,
 &'a test_utils::TestLogger>;

	struct ANodeHolder<'a, P: Persist<InMemorySigner>> {
@valentinewallacevalentinewallaceApr 12, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we migrate the BackgroundProcessor utils as well so they can use functional_test_utils?
@TheBlueMattTheBlueMattApr 12, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, but its a bit big, would have to add a bunch of new accessors and maybe do the chain tracking via the trait too.
Comment threadlightning/src/ln/functional_test_utils.rs
Comment threadlightning/src/ln/functional_test_utils.rs
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
1be3caf to
db9cd01CompareApril 12, 2023 20:03
@codecov-commenter
codecov-commenter
commented
Apr 12, 2023•

edited by codecov
Bot
Loading

Copy link


Copy Markdown

Codecov Report
❌ Patch coverage is 98.27586% with 1 line in your changes missing coverage. Please review.

✅ Project coverage is 91.34%. Comparing base (157af6e) to head (cfb9eb9).
⚠️ Report is 6169 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/ln/functional_test_utils.rs98.18%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #2177 +/- ##
==========================================
- Coverage 91.36% 91.34% -0.02% 
==========================================
Files 102 102 Lines 50369 50401 +32 Branches 50369 50401 +32 ==========================================
+ Hits 46018 46040 +22 - Misses 4351 4361 +10 
☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.
 🚀 New features to boost your workflow: 
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
valentinewallace
valentinewallace
reviewed
Apr 13, 2023
View reviewed changes
@valentinewallacevalentinewallace
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after @wpaulino takes a look
Comment threadlightning/src/ln/functional_test_utils.rs
Outdated

@TheBlueMatt
Introduce traits to make test utils generic across the CM Holder
d556236
In our test utilities, we generally refer to a `Node` struct which
holds a `ChannelManager` and a number of other structs. However, we
use the same utilities in benchmarking, where we have a different
`Node`-like struct. This made moving from macros to functions
entirely impossible, as we end up needing multiple types in a given
context.
Thus, here, we take the pain and introduce some wrapper traits
which encapsulte what we need from `Node`, swapping some of our
macros to functions.
@TheBlueMatt
Move some additional test macros into functions
cfb9eb9
This marginally reduces the quantity of code compiled in tests
further.
@TheBlueMatt
TheBlueMattforce-pushed
the
2023-04-test-function-generics
branch
from
db9cd01 to
cfb9eb9CompareApril 13, 2023 18:40
@TheBlueMatt
TheBlueMatt
commented
Apr 13, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Squashed with typo fixes:
$ git diff-tree -U1 db9cd012 cfb9eb96
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index d35d286bb..f8ccce058 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -1566,3 +1566,3 @@ macro_rules! commitment_signed_dance {
/// Runs the commitment_signed dance after the initial commitment_signed is delivered through to
-/// the initiator's `revoke_and_ack` resposne. i.e. [`do_main_commitment_signed_dance`] plus the
+/// the initiator's `revoke_and_ack` response. i.e. [`do_main_commitment_signed_dance`] plus the
/// `revoke_and_ack` response to it.
@@ -1579,3 +1579,3 @@ pub fn commitment_signed_dance_through_cp_raa(node_a: &Node<'_, '_, '_>, node_b:
/// been delivered, this method picks up and delivers the response `revoke_and_ack` and
-/// `commitment_signed`, returning the receipient's `revoke_and_ack` and any extra message it may
+/// `commitment_signed`, returning the recipient's `revoke_and_ack` and any extra message it may
/// have included.

@wpaulino
wpaulino
merged commit 1505089
into
lightningdevkit:mainApr 17, 2023
@tnulltnull
mentioned this pull request
Apr 18, 2023
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino approved these changes
@valentinewallacevalentinewallacevalentinewallace approved these changes

Assignees

@wpaulinowpaulino
@valentinewallacevalentinewallace

Labels


None yet


Projects


None yet


Milestone

0.0.115

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@wpaulino@valentinewallace