projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1851 from TheBlueMatt/2022-11-fix-broken-futures-----again
[rust-lightning]
/
lightning
/
src
/
ln
/
reorg_tests.rs
diff --git
a/lightning/src/ln/reorg_tests.rs
b/lightning/src/ln/reorg_tests.rs
index 1e26d33920ac5862dc7430cbb4b34d73f9537ddd..a445f420a9c96011238a28a0eff4c7e0e8fe4426 100644
(file)
--- a/
lightning/src/ln/reorg_tests.rs
+++ b/
lightning/src/ln/reorg_tests.rs
@@
-276,7
+276,7
@@
fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 1);
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 1);
- assert_eq!(
channel_state.short_to_chan_info
.len(), 2);
+ assert_eq!(
nodes[0].node.short_to_chan_info.read().unwrap()
.len(), 2);
mem::drop(channel_state);
if !reorg_after_reload {
mem::drop(channel_state);
if !reorg_after_reload {
@@
-305,7
+305,7
@@
fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
{
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 0);
{
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 0);
- assert_eq!(
channel_state.short_to_chan_info
.len(), 0);
+ assert_eq!(
nodes[0].node.short_to_chan_info.read().unwrap()
.len(), 0);
}
}
}
}
@@
-383,7
+383,7
@@
fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
{
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 0);
{
let channel_state = nodes[0].node.channel_state.lock().unwrap();
assert_eq!(channel_state.by_id.len(), 0);
- assert_eq!(
channel_state.short_to_chan_info
.len(), 0);
+ assert_eq!(
nodes[0].node.short_to_chan_info.read().unwrap()
.len(), 0);
}
}
// With expect_channel_force_closed set the TestChainMonitor will enforce that the next update
}
}
// With expect_channel_force_closed set the TestChainMonitor will enforce that the next update