Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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" + '
Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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('^' + ".*" + ' Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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('^' + ".*" + ' Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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" + ' Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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('^' + ".*" + ' Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino
, '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); } })(); })(); Fix and test in-flight HTLC scoring in between retries by valentinewallace · Pull Request #2020 · lightningdevkit/rust-lightning · GitHub
Skip to content

Fix and test in-flight HTLC scoring in between retries - #2020

Merged
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring
Feb 15, 2023
Merged

Fix and test in-flight HTLC scoring in between retries #2020
TheBlueMatt merged 3 commits into
lightningdevkit:mainfrom
valentinewallace:2023-02-test-inflight-scoring

Conversation

@valentinewallace

Copy link
Copy Markdown
Contributor

Turns out that untested code really is broken code.

I think we don't need to do something similar for the first_hops because retries know what scids failed previously. That doesn't cover all cases, but on the other hand it saves a vec allocation to not recompute first hops and should be rare, so I think it's good enough(?).

Partially addresses #1932.

@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from ec20301 to 70f2873CompareFebruary 7, 2023 19:28
@codecov-commenter

codecov-commenter commented Feb 7, 2023

Copy link
Copy Markdown

Codecov Report

Base: 87.33% // Head: 87.31% // Decreases project coverage by -0.03%⚠️

Coverage data is based on head (3ddb8ff) compared to base (be4bb58).
Patch coverage: 87.87% of modified lines in pull request are covered.

❗ Current head 3ddb8ff differs from pull request most recent head 2b2965f. Consider uploading reports for the commit 2b2965f to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2020 +/- ##
==========================================
- Coverage 87.33% 87.31% -0.03% 
==========================================
Files 100 100 Lines 44160 44168 +8 Branches 44160 44168 +8 ==========================================
- Hits 38568 38566 -2 - Misses 5592 5602 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_tests.rs97.20% <ø> (-0.01%)⬇️
lightning/src/ln/onion_route_tests.rs95.25% <ø> (ø)
lightning/src/ln/shutdown_tests.rs96.36% <ø> (-0.01%)⬇️
lightning/src/util/test_utils.rs67.02% <82.50%> (+2.07%)⬆️
lightning/src/ln/outbound_payment.rs80.28% <92.30%> (+0.08%)⬆️
lightning-invoice/src/utils.rs96.14% <100.00%> (ø)
lightning/src/ln/channelmanager.rs86.91% <100.00%> (-0.02%)⬇️
lightning/src/ln/functional_test_utils.rs88.65% <100.00%> (+0.17%)⬆️
lightning/src/ln/payment_tests.rs96.59% <100.00%> (+0.01%)⬆️
lightning/src/routing/router.rs92.65% <100.00%> (-0.16%)⬇️
... and 4 more

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.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Ah the ancient proverbs strike agian.

Needs rebase already lol. Basically LGTM tho, but no-std is sad.

@TheBlueMattTheBlueMatt added this to the 0.0.114 milestone Feb 7, 2023
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch 2 times, most recently from 0db65a2 to 6ddf6baCompareFebruary 8, 2023 23:20
@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Tacked on a small commit to remove unnecessary (as of #1996) Router trait methods

Comment threadlightning/src/util/test_utils.rs
wpaulino
wpaulino previously approved these changes Feb 10, 2023
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase :(

@valentinewallace

Copy link
Copy Markdown
ContributorAuthor

Rebased

Comment threadlightning/src/util/test_utils.rs Outdated
Comment threadlightning/src/util/test_utils.rs Outdated
@valentinewallace
valentinewallaceforce-pushed the 2023-02-test-inflight-scoring branch from 61ec630 to 3ddb8ffCompareFebruary 13, 2023 21:08
wpaulino
wpaulino previously approved these changes Feb 13, 2023
Comment threadlightning/src/util/test_utils.rs Outdated
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Note that this only actually tests the InFlightHtlcs creation in send_payment_with_retry. It would be nice to test the two other cases where we have a similar constructor in channelmanager. Can happen later though.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

CI failure is #2032, will need to kick it after other jobs complete, nbd.

@TheBlueMatt
TheBlueMatt merged commit 2edb3f1 into lightningdevkit:mainFeb 15, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@codecov-commenter@TheBlueMatt@wpaulino