Skip to content

Move router test utils into their own module - #1731

Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged

Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2022-09-router-test-utils-mod

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 19, 2022

Copy link
Copy Markdown
Contributor

Used in #1724 to test onion message pathfinding

@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull reviewed Sep 20, 2022
View reviewed changes

@tnulltnull 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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?

@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace

valentinewallace commented Sep 20, 2022

Copy link
Copy Markdown
ContributorAuthor

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?

Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.

Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?

@valentinewallacevalentinewallace mentioned this pull request Sep 20, 2022
Closed
2 tasks
TheBlueMatt
TheBlueMatt previously approved these changes Sep 20, 2022
View reviewed changes
@TheBlueMatt

TheBlueMatt commented Sep 20, 2022

Copy link
Copy Markdown
Collaborator

I'm fine with any resolution to the module resolution.

dunxen
dunxen previously approved these changes Sep 20, 2022
View reviewed changes

@dunxendunxen 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.

Makes sense and LGTM!

@tnull

tnull commented Sep 21, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?

Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.

Also, feel free to squash.

@valentinewallace

valentinewallace commented Sep 21, 2022

Copy link
Copy Markdown
ContributorAuthor

Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.

Also, feel free to squash.

Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate

@codecov-commenter

codecov-commenter commented Sep 21, 2022•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉

Coverage data is based on head (2f19b64) compared to base (d698898).
Patch coverage: 97.08% of modified lines in pull request are covered.

❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results

Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed the 2022-09-router-test-utils-mod branch from 2f19b64 to 95a4173CompareSeptember 21, 2022 19:10
@valentinewallace

valentinewallace commented Sep 21, 2022

Copy link
Copy Markdown
ContributorAuthor

I don't think that CI failure is related to the PR 🤔

@dunxen

dunxen commented Sep 22, 2022

Copy link
Copy Markdown
Contributor

I don't think that CI failure is related to the PR 🤔

Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)

@valentinewallace
valentinewallace merged commit c614a27 into lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen
, '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" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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('^' + ".*" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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('^' + ".*" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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('^' + ".*" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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('^' + ".*" + '
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen

, '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); }
})();
})();
Move router test utils into their own module by valentinewallace · Pull Request #1731 · lightningdevkit/rust-lightning · GitHub
Skip to content
Move router test utils into their own module - #1731
Merged
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Sep 22, 2022
Merged
Move router test utils into their own module#1731
valentinewallace merged 3 commits into
lightningdevkit:mainfrom 
valentinewallace:2022-09-router-test-utils-mod
Conversation
@valentinewallace
@valentinewallacevalentinewallace
commented
Sep 19, 2022

Copy link


Copy Markdown

Contributor
Used in #1724 to test onion message pathfinding
@valentinewallace
Move router test utils into their own module
615b401
Useful for testing onion message pathfinding in upcoming PRs and any future
routing modules we add
tnull
tnull
reviewed
Sep 20, 2022
View reviewed changes
@tnulltnull
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.

Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
@valentinewallace
Rename routing::router::test_utils to ::bench_utils
feabd61
To disambiguate it from routing::test_utils
@valentinewallace
valentinewallace
commented
Sep 20, 2022

Copy link


Copy Markdown

ContributorAuthor
Generally looks good, but it could get a bit confusing that there are now two test_utils that are even both referenced in router.rs. Maybe we could solve this for the time being by removing the use statements and always using the full routing::test_utils/util::test_utils prefix to make it explicit?
Hmm I feel like that would add a lot of verbosity since both of those test util modules are used in a ton of places.
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
@valentinewallacevalentinewallace
mentioned this pull request
Sep 20, 2022
 Closed

2 tasks
TheBlueMatt
TheBlueMatt
previously approved these changes
Sep 20, 2022
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Sep 20, 2022

Copy link


Copy Markdown

Collaborator
I'm fine with any resolution to the module resolution.
dunxen
dunxen
previously approved these changes
Sep 20, 2022
View reviewed changes
@dunxendunxen
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.

Makes sense and LGTM!
@tnull
tnull
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Contributor
Do you think it would help if I modified the import to be: use util::test_utils as ln_test_utils; so that all the current e.g. test_utils::TestScorer would be ln_test_utils::TestScorer?
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
Yup, use util::test_utils as ln_test_utils; would def. do the trick. No hard requirement though, feel free to leave it out if you think it gets too verbose, moving some to bench_utils already helped.
Also, feel free to squash.
Sg, I went ahead with that. I kinda prefer to keep the first big commit as a "pure code move" (modulo imports/exposing stuff as pub(super)) so I kept the commits separate
@codecov-commenter
codecov-commenter
commented
Sep 21, 2022•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Base: 90.70% // Head: 90.82% // Increases project coverage by +0.12% 🎉
Coverage data is based on head (2f19b64) compared to base (d698898).

Patch coverage: 97.08% of modified lines in pull request are covered.
❗ Current head 2f19b64 differs from pull request most recent head 95a4173. Consider uploading reports for the commit 95a4173 to get more accurate results
Additional details and impacted files
@@ Coverage Diff @@## main #1731 +/- ##
==========================================
+ Coverage 90.70% 90.82% +0.12% 
==========================================
Files 86 87 +1 Lines 46679 48356 +1677 Branches 46679 48356 +1677 ==========================================
+ Hits 42338 43920 +1582 - Misses 4341 4436 +95 
Impacted FilesCoverage Δ
lightning/src/routing/gossip.rs91.44% <ø> (ø)
lightning/src/routing/router.rs91.62% <95.00%> (-0.45%)⬇️
lightning/src/routing/test_utils.rs97.93% <97.93%> (ø)
lightning/src/ln/functional_tests.rs96.88% <0.00%> (-0.11%)⬇️
lightning/src/chain/onchaintx.rs95.63% <0.00%> (+1.14%)⬆️
lightning/src/ln/channelmanager.rs87.85% <0.00%> (+2.82%)⬆️
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
☔ View full report at Codecov.

📢 Do you have feedback about the report comment? Let us know in this issue.
@valentinewallace
Import util::test_utils as ::ln_test_utils in router
95a4173
To disambiguate between util::test_utils and router::test_utils
@valentinewallace
valentinewallaceforce-pushed
the
2022-09-router-test-utils-mod
branch
from
2f19b64 to
95a4173CompareSeptember 21, 2022 19:10
@valentinewallace
valentinewallace
commented
Sep 21, 2022

Copy link


Copy Markdown

ContributorAuthor
I don't think that CI failure is related to the PR 🤔
@dunxen
dunxen
commented
Sep 22, 2022

Copy link


Copy Markdown

Contributor
I don't think that CI failure is related to the PR 🤔
Yeah seems some no-std dependency broke the MSRV. (Assuming it's the same issue I have on one PR)
@valentinewallace
valentinewallace
merged commit c614a27
into
lightningdevkit:mainSep 22, 2022
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@dunxendunxendunxen approved these changes
@TheBlueMattTheBlueMattAwaiting requested review from TheBlueMatt

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

@valentinewallace@TheBlueMatt@tnull@codecov-commenter@dunxen