Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 3 commits into from
Feb 27, 2023
Merged

Remove the lightning-transaction-sync MSRV #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb0f696
Fix silent rebase conflict in previous PR
TheBlueMatt Feb 27, 2023
0fc5a3a
Remove the `lightning-transaction-sync` MSRV
TheBlueMatt Feb 27, 2023
64a7567
Move `lightning-transaction-sync` out of the main workspace
TheBlueMatt Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
# 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
1.45.2,
# 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
1.47.0,
# 1.59.0 is the MSRV for lightning-transaction-sync
1.59.0]
1.47.0]
include:
- toolchain: stable
build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
build-futures: true
build-no-std: true
build-tx-sync: false
- toolchain: 1.59.0
build-net-tokio: false
build-no-std: false
build-futures: false
build-tx-sync: true
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
run: cargo update -p tokio --precise "1.14.0" --verbose
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio
if: "matrix.build-net-tokio && !matrix.coverage"
run: cargo build --verbose --color always
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
- name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
if: matrix.coverage
run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
- name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
run: |
cd lightning && cargo test --verbose --color always --features backtrace
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio
if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
if: "matrix.build-net-tokio && !matrix.coverage"

@wpaulinowpaulinoFeb 27, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.

@TheBlueMattTheBlueMattFeb 27, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.

@wpaulinowpaulinoFeb 27, 2023•
edited
Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.

run: cargo test --verbose --color always
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
- name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
if: matrix.coverage
run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
- name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
"lightning",
"lightning-block-sync",
"lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.
"lightning-invoice",
"lightning-net-tokio",
"lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
"lightning-custom-message",
"lightning-transaction-sync",
"no-std-check",
]

Expand Down
3 changes: 1 addition & 2 deletions lightning/src/ln/outbound_payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
fn initial_send_payment_path_failed_evs() {
let outbound_payments = OutboundPayments::new();
let logger = test_utils::TestLogger::new();
let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
let scorer = Mutex::new(test_utils::TestScorer::new());
let router = test_utils::TestRouter::new(network_graph, &scorer);
let secp_ctx = Secp256k1::new();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

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

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down

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

Skip to content
Remove the lightning-transaction-sync MSRV#2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 3 commits into

from

Feb 27, 2023
 Merged


Remove the lightning-transaction-sync MSRV
#2055
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
bb0f696

Fix silent rebase conflict in previous PR


TheBlueMatt Feb 27, 2023
0fc5a3a

Remove the `lightning-transaction-sync` MSRV


TheBlueMatt Feb 27, 2023
64a7567

Move `lightning-transaction-sync` out of the main workspace


TheBlueMatt Feb 27, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


19 changes: 6 additions & 13 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,9 +15,7 @@ jobs:
 # 1.45.2 is MSRV for lightning-net-tokio, lightning-block-sync, lightning-background-processor
 1.45.2,
 # 1.47.0 will be the MSRV for no-std builds using hashbrown once core2 is updated
 1.47.0,
 # 1.59.0 is the MSRV for lightning-transaction-sync
 1.59.0]
 1.47.0]
 include:
 - toolchain: stable
 build-net-tokio: true
Expand DownExpand Up@@ -73,11 +71,6 @@ jobs:
 build-futures: true
 build-no-std: true
 build-tx-sync: false
 - toolchain: 1.59.0
 build-net-tokio: false
 build-no-std: false
 build-futures: false
 build-tx-sync: true
 runs-on: ${{ matrix.platform }}
 steps:
 - name: Checkout source code
Expand All@@ -93,10 +86,10 @@ jobs:
 run: cargo update -p tokio --precise "1.14.0" --verbose
 env:
 CARGO_NET_GIT_FETCH_WITH_CLI: "true"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage"
 run: cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always
 - name: Build on Rust ${{ matrix.toolchain }}
Expand DownExpand Up@@ -151,9 +144,9 @@ jobs:
 run: |
 cd lightning && cargo test --verbose --color always --features backtrace
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio
 if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync"
 if: "matrix.build-net-tokio && !matrix.coverage"
@wpaulinowpaulinoFeb 27, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In line 137, can we assume that if matrix.coverage is not set then it is false? If so, we already have a build covering that in line 125.
@TheBlueMattTheBlueMattFeb 27, 2023

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

I'm not sure what you're asking? We have two builds, one for coverage and one for not-coverage, the coverage one sets link-dead-code.
@wpaulinowpaulinoFeb 27, 2023•

edited

Loading

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.

Right, and on line 136, there's another build for lightning-transaction-sync where the condition doesn't check for matrix.coverage at all. Just wondering if there's a difference here, because if there isn't, then that build could be removed.
 run: cargo test --verbose --color always
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation
 - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation
 if: matrix.coverage
 run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
 - name: Test no-std builds on Rust ${{ matrix.toolchain }}
Expand Down

2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@
members = [
 "lightning",
 "lightning-block-sync",
 "lightning-transaction-sync",
Comment thread
tnull marked this conversation as resolved.

 "lightning-invoice",
 "lightning-net-tokio",
 "lightning-persister",
Expand All@@ -13,6 +12,7 @@ members = [

exclude = [
 "lightning-custom-message",
 "lightning-transaction-sync",
 "no-std-check",
]

Expand Down

3 changes: 1 addition & 2 deletions
lightning/src/ln/outbound_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1459,8 +1459,7 @@ mod tests {
	fn initial_send_payment_path_failed_evs() {
 let outbound_payments = OutboundPayments::new();
 let logger = test_utils::TestLogger::new();
 let genesis_hash = genesis_block(Network::Testnet).header.block_hash();
 let network_graph = Arc::new(NetworkGraph::new(genesis_hash, &logger));
 let network_graph = Arc::new(NetworkGraph::new(Network::Testnet, &logger));
 let scorer = Mutex::new(test_utils::TestScorer::new());
 let router = test_utils::TestRouter::new(network_graph, &scorer);
 let secp_ctx = Secp256k1::new();
Expand Down