projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a test for shutdown negotiaion funder restart and timeout
[rust-lightning]
/
lightning
/
src
/
ln
/
functional_test_utils.rs
diff --git
a/lightning/src/ln/functional_test_utils.rs
b/lightning/src/ln/functional_test_utils.rs
index 565f1305963a82c563515d5d645910ba5e7fac9a..3b0a8452b7b16ec713f90c5640c8059469d94d59 100644
(file)
--- a/
lightning/src/ln/functional_test_utils.rs
+++ b/
lightning/src/ln/functional_test_utils.rs
@@
-416,12
+416,22
@@
macro_rules! get_htlc_update_msgs {
}
}
}
}
+#[cfg(test)]
+macro_rules! get_channel_ref {
+ ($node: expr, $lock: ident, $channel_id: expr) => {
+ {
+ $lock = $node.node.channel_state.lock().unwrap();
+ $lock.by_id.get_mut(&$channel_id).unwrap()
+ }
+ }
+}
+
#[cfg(test)]
macro_rules! get_feerate {
($node: expr, $channel_id: expr) => {
{
#[cfg(test)]
macro_rules! get_feerate {
($node: expr, $channel_id: expr) => {
{
- let
chan_lock = $node.node.channel_state.lock().unwrap()
;
- let chan =
chan_lock.by_id.get(&$channel_id).unwrap(
);
+ let
mut lock
;
+ let chan =
get_channel_ref!($node, lock, $channel_id
);
chan.get_feerate()
}
}
chan.get_feerate()
}
}