Skip to content

398 with nits fixed.#439

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 2 commits into from
Jan 6, 2020
Merged

398 with nits fixed. #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ace59
Add assert_log method to TestLogger to harden test
Dec 30, 2019
933ae34
Drop Result for ChannelMessageHandler methods
Nov 5, 2019
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
45 changes: 21 additions & 24 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
} else { panic!("Wrong event type"); }
};

$dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
$dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
let accept_channel = {
let events = $dest.get_and_clear_pending_msg_events();
assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
} else { panic!("Wrong event type"); }
};

$source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
$source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
{
let events = $source.get_and_clear_pending_events();
assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
msg.clone()
} else { panic!("Wrong event type"); }
};
$dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
$dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

let funding_signed = {
let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
msg.clone()
} else { panic!("Wrong event type"); }
};
$source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
$source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

{
let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
for node in $nodes.iter() {
if node.get_our_node_id() == *node_id {
node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
}
}
} else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
let mut node_c_ser = VecWriter(Vec::new());
nodes[2].write(&mut node_c_ser).unwrap();

macro_rules! test_err {
($res: expr) => {
match $res {
Ok(()) => {},
Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
_ => { $res.unwrap() },
}
}
}

macro_rules! test_return {
() => { {
assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
assert!(update_fee.is_none());
for update_add in update_add_htlcs {
if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
} else {
// Corrupt the update_add_htlc message so that its HMAC
// check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
let mut msg_ser = update_add.encode();
msg_ser[1000] ^= 0xff;
let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
}
}
for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
}
for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
}
for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
}
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
}
}
},
events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
for dest in nodes.iter() {
if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
}
}
},
events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
for dest in nodes.iter() {
if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
}
}
},
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
// Can be generated due to a payment forward being rejected due to a
// channel having previously failed a monitor update
},
events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
// Can be generated at any processing step to send back an error, disconnect
// peer or just ignore
},
_ => panic!("Unhandled message event"),
}
}
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
events::MessageSendEvent::SendChannelReestablish { .. } => {},
events::MessageSendEvent::SendFundingLocked { .. } => {},
events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
_ => panic!("Unhandled message event"),
}
}
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
events::MessageSendEvent::SendChannelReestablish { .. } => {},
events::MessageSendEvent::SendFundingLocked { .. } => {},
events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
_ => panic!("Unhandled message event"),
}
}
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
},
events::MessageSendEvent::SendFundingLocked { .. } => false,
events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
_ => panic!("Unhandled message event"),
};
if push { msg_sink.push(event); }
Expand Down
Loading
, '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" + '
398 with nits fixed. by TheBlueMatt · Pull Request #439 · lightningdevkit/rust-lightning · GitHub
Skip to content
398 with nits fixed.#439

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

, '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('^' + ".*" + '
398 with nits fixed. by TheBlueMatt · Pull Request #439 · lightningdevkit/rust-lightning · GitHub
Skip to content
398 with nits fixed.#439

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

, '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('^' + ".*" + '
398 with nits fixed. by TheBlueMatt · Pull Request #439 · lightningdevkit/rust-lightning · GitHub
Skip to content
398 with nits fixed.#439

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

, '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" + '
398 with nits fixed. by TheBlueMatt · Pull Request #439 · lightningdevkit/rust-lightning · GitHub
Skip to content
398 with nits fixed.#439

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

, '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('^' + ".*" + '
398 with nits fixed. by TheBlueMatt · Pull Request #439 · lightningdevkit/rust-lightning · GitHub
Skip to content
398 with nits fixed.#439

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

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

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading

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

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 2 commits into

from

Jan 6, 2020
 Merged


398 with nits fixed.
#439
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
29ace59

Add assert_log method to TestLogger to harden test

Dec 30, 2019
933ae34

Drop Result for ChannelMessageHandler methods

Nov 5, 2019

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


45 changes: 21 additions & 24 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ use lightning::ln::channelmonitor;
use lightning::ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, HTLCUpdate};
use lightning::ln::channelmanager::{ChannelManager, PaymentHash, PaymentPreimage, ChannelManagerReadArgs};
use lightning::ln::router::{Route, RouteHop};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, ErrorAction, LightningError, UpdateAddHTLC, LocalFeatures};
use lightning::ln::msgs::{CommitmentUpdate, ChannelMessageHandler, UpdateAddHTLC, LocalFeatures, ErrorAction};
use lightning::util::enforcing_trait_impls::EnforcingChannelKeys;
use lightning::util::events;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -252,7 +252,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel).unwrap();
 $dest.handle_open_channel(&$source.get_our_node_id(), LocalFeatures::new(), &open_channel);
 let accept_channel = {
 let events = $dest.get_and_clear_pending_msg_events();
 assert_eq!(events.len(), 1);
Expand All@@ -261,7 +261,7 @@ pub fn do_test(data: &[u8]) {
 } else { panic!("Wrong event type"); }
 };

 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel).unwrap();
 $source.handle_accept_channel(&$dest.get_our_node_id(), LocalFeatures::new(), &accept_channel);
 {
 let events = $source.get_and_clear_pending_events();
 assert_eq!(events.len(), 1);
Expand All@@ -282,7 +282,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created).unwrap();
 $dest.handle_funding_created(&$source.get_our_node_id(), &funding_created);

 let funding_signed = {
 let events = $dest.get_and_clear_pending_msg_events();
Expand All@@ -291,7 +291,7 @@ pub fn do_test(data: &[u8]) {
 msg.clone()
 } else { panic!("Wrong event type"); }
 };
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed).unwrap();
 $source.handle_funding_signed(&$dest.get_our_node_id(), &funding_signed);

 {
 let events = $source.get_and_clear_pending_events();
Expand DownExpand Up@@ -330,7 +330,7 @@ pub fn do_test(data: &[u8]) {
 if let events::MessageSendEvent::SendFundingLocked { ref node_id, ref msg } = event {
 for node in $nodes.iter() {
 if node.get_our_node_id() == *node_id {
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg).unwrap();
 node.handle_funding_locked(&$nodes[idx].get_our_node_id(), msg);
 }
 }
 } else { panic!("Wrong event type"); }
Expand DownExpand Up@@ -381,16 +381,6 @@ pub fn do_test(data: &[u8]) {
	let mut node_c_ser = VecWriter(Vec::new());
	nodes[2].write(&mut node_c_ser).unwrap();

	macro_rules! test_err {
 ($res: expr) => {
 match $res {
 Ok(()) => {},
 Err(LightningError { action: ErrorAction::IgnoreError, .. }) => { },
 _ => { $res.unwrap() },
 }
 }
	}

	macro_rules! test_return {
 () => { {
 assert_eq!(nodes[0].list_channels().len(), 1);
Expand DownExpand Up@@ -470,7 +460,7 @@ pub fn do_test(data: &[u8]) {
 assert!(update_fee.is_none());
 for update_add in update_add_htlcs {
 if !$corrupt_forward {
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &update_add);
 } else {
 // Corrupt the update_add_htlc message so that its HMAC
 // check will fail and we generate a
Expand All@@ -479,33 +469,33 @@ pub fn do_test(data: &[u8]) {
 let mut msg_ser = update_add.encode();
 msg_ser[1000] ^= 0xff;
 let new_msg = UpdateAddHTLC::read(&mut Cursor::new(&msg_ser)).unwrap();
test_err!(dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg));
 dest.handle_update_add_htlc(&nodes[$node].get_our_node_id(), &new_msg);
 }
 }
 for update_fulfill in update_fulfill_htlcs {
test_err!(dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill));
 dest.handle_update_fulfill_htlc(&nodes[$node].get_our_node_id(), &update_fulfill);
 }
 for update_fail in update_fail_htlcs {
test_err!(dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail));
 dest.handle_update_fail_htlc(&nodes[$node].get_our_node_id(), &update_fail);
 }
 for update_fail_malformed in update_fail_malformed_htlcs {
test_err!(dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed));
 dest.handle_update_fail_malformed_htlc(&nodes[$node].get_our_node_id(), &update_fail_malformed);
 }
test_err!(dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed));
 dest.handle_commitment_signed(&nodes[$node].get_our_node_id(), &commitment_signed);
 }
 }
 },
 events::MessageSendEvent::SendRevokeAndACK { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg));
 dest.handle_revoke_and_ack(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
 events::MessageSendEvent::SendChannelReestablish { ref node_id, ref msg } => {
 for dest in nodes.iter() {
 if dest.get_our_node_id() == *node_id {
test_err!(dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg));
 dest.handle_channel_reestablish(&nodes[$node].get_our_node_id(), msg);
 }
 }
 },
Expand All@@ -516,6 +506,10 @@ pub fn do_test(data: &[u8]) {
 // Can be generated due to a payment forward being rejected due to a
 // channel having previously failed a monitor update
 },
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {
 // Can be generated at any processing step to send back an error, disconnect
 // peer or just ignore
 },
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -532,6 +526,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -544,6 +539,7 @@ pub fn do_test(data: &[u8]) {
 events::MessageSendEvent::SendChannelReestablish { .. } => {},
 events::MessageSendEvent::SendFundingLocked { .. } => {},
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => {},
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => {},
 _ => panic!("Unhandled message event"),
 }
 }
Expand All@@ -565,6 +561,7 @@ pub fn do_test(data: &[u8]) {
 },
 events::MessageSendEvent::SendFundingLocked { .. } => false,
 events::MessageSendEvent::PaymentFailureNetworkUpdate { .. } => false,
 events::MessageSendEvent::HandleError { action: ErrorAction::IgnoreError, .. } => false,
 _ => panic!("Unhandled message event"),
 };
 if push { msg_sink.push(event); }
Expand Down
Loading