Skip to content

Commit 5856f53

Browse files
ViktorTigerstromViktorTigerstrom
committed
Remove excess channel_state passing to macros
As the `short_to_chan_info` has been moved out of the `channel_state` to a standalone lock, several macros no longer need the `channel_state` passed into the macro.
1 parent a90bad9 commit 5856f53

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎lightning/src/ln/channelmanager.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,7 +1348,7 @@ macro_rules! convert_chan_err {
13481348
}
13491349

13501350
macro_rules! break_chan_entry {
1351-
($self: ident, $res: expr, $channel_state: expr, $entry: expr) => {
1351+
($self: ident, $res: expr, $entry: expr) => {
13521352
match $res {
13531353
Ok(res) => res,
13541354
Err(e) => {
@@ -1363,7 +1363,7 @@ macro_rules! break_chan_entry {
13631363
}
13641364

13651365
macro_rules! try_chan_entry {
1366-
($self: ident, $res: expr, $channel_state: expr, $entry: expr) => {
1366+
($self: ident, $res: expr, $entry: expr) => {
13671367
match $res {
13681368
Ok(res) => res,
13691369
Err(e) => {
@@ -1378,7 +1378,7 @@ macro_rules! try_chan_entry {
13781378
}
13791379

13801380
macro_rules! remove_channel {
1381-
($self: expr, $channel_state: expr, $entry: expr) => {
1381+
($self: expr, $entry: expr) => {
13821382
{
13831383
let channel = $entry.remove_entry().1;
13841384
update_maps_on_chan_removal!($self, channel);
@@ -1919,7 +1919,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
19191919
let (result, is_permanent) =
19201920
handle_monitor_update_res!(self, update_res, chan_entry.get_mut(), RAACommitmentOrder::CommitmentFirst, chan_entry.key(), NO_UPDATE);
19211921
if is_permanent {
1922-
remove_channel!(self, channel_state, chan_entry);
1922+
remove_channel!(self, chan_entry);
19231923
break result;
19241924
}
19251925
}
@@ -1930,7 +1930,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
19301930
});
19311931

19321932
if chan_entry.get().is_shutdown() {
1933-
let channel = remove_channel!(self, channel_state, chan_entry);
1933+
let channel = remove_channel!(self, chan_entry);
19341934
if let Ok(channel_update) = self.get_channel_update_for_broadcast(&channel) {
19351935
channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
19361936
msg: channel_update
@@ -2031,7 +2031,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
20312031
} else {
20322032
self.issue_channel_close_events(chan.get(),ClosureReason::HolderForceClosed);
20332033
}
2034-
remove_channel!(self, channel_state, chan)
2034+
remove_channel!(self, chan)
20352035
} else {
20362036
return Err(APIError::ChannelUnavailable{err: "No such channel".to_owned()});
20372037
}
@@ -2506,7 +2506,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
25062506
payment_secret: payment_secret.clone(),
25072507
payment_params: payment_params.clone(),
25082508
}, onion_packet, &self.logger),
2509-
channel_state, chan)
2509+
chan)
25102510
} {
25112511
Some((update_add, commitment_signed, monitor_update)) => {
25122512
let update_err = self.chain_monitor.update_channel(chan.get().get_funding_txo().unwrap(), monitor_update);
@@ -3320,7 +3320,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
33203320
}
33213321
ChannelError::Close(msg) => {
33223322
log_trace!(self.logger, "Closing channel {} due to Close-required error: {}", log_bytes!(chan.key()[..]), msg);
3323-
let mut channel = remove_channel!(self, channel_state, chan);
3323+
let mut channel = remove_channel!(self, chan);
33243324
// ChannelClosed event is generated by handle_error for us.
33253325
Err(MsgHandleErrInternal::from_finish_shutdown(msg, channel.channel_id(), channel.get_user_id(), channel.force_shutdown(true), self.get_channel_update_for_broadcast(&channel).ok()))
33263326
},
@@ -4549,7 +4549,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
45494549
}
45504550
};
45514551
channel_state.pending_msg_events.push(send_msg_err_event);
4552-
let _ = remove_channel!(self, channel_state, channel);
4552+
let _ = remove_channel!(self, channel);
45534553
return Err(APIError::APIMisuseError { err: "Please use accept_inbound_channel_from_trusted_peer_0conf to accept channels with zero confirmations.".to_owned() });
45544554
}
45554555

@@ -4629,7 +4629,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
46294629
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
46304630
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.temporary_channel_id));
46314631
}
4632-
try_chan_entry!(self, chan.get_mut().accept_channel(&msg, &self.default_configuration.channel_handshake_limits, &their_features), channel_state, chan);
4632+
try_chan_entry!(self, chan.get_mut().accept_channel(&msg, &self.default_configuration.channel_handshake_limits, &their_features), chan);
46334633
(chan.get().get_value_satoshis(), chan.get().get_funding_redeemscript().to_v0_p2wsh(), chan.get().get_user_id())
46344634
},
46354635
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.temporary_channel_id))
@@ -4656,7 +4656,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
46564656
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
46574657
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.temporary_channel_id));
46584658
}
4659-
(try_chan_entry!(self, chan.get_mut().funding_created(msg, best_block, &self.logger), channel_state, chan), chan.remove())
4659+
(try_chan_entry!(self, chan.get_mut().funding_created(msg, best_block, &self.logger), chan), chan.remove())
46604660
},
46614661
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.temporary_channel_id))
46624662
}
@@ -4729,7 +4729,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
47294729
}
47304730
let (monitor, funding_tx, channel_ready) = match chan.get_mut().funding_signed(&msg, best_block, &self.logger) {
47314731
Ok(update) => update,
4732-
Err(e) => try_chan_entry!(self, Err(e), channel_state, chan),
4732+
Err(e) => try_chan_entry!(self, Err(e), chan),
47334733
};
47344734
match self.chain_monitor.watch_channel(chan.get().get_funding_txo().unwrap(), monitor) {
47354735
ChannelMonitorUpdateStatus::Completed => {},
@@ -4768,7 +4768,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
47684768
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
47694769
}
47704770
let announcement_sigs_opt = try_chan_entry!(self, chan.get_mut().channel_ready(&msg, self.get_our_node_id(),
4771-
self.genesis_hash.clone(), &self.best_block.read().unwrap(), &self.logger), channel_state, chan);
4771+
self.genesis_hash.clone(), &self.best_block.read().unwrap(), &self.logger), chan);
47724772
if let Some(announcement_sigs) = announcement_sigs_opt {
47734773
log_trace!(self.logger, "Sending announcement_signatures for channel {}", log_bytes!(chan.get().channel_id()));
47744774
channel_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
@@ -4816,7 +4816,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48164816
if chan_entry.get().sent_shutdown() { " after we initiated shutdown" } else { "" });
48174817
}
48184818

4819-
let (shutdown, monitor_update, htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.keys_manager, &their_features, &msg), channel_state, chan_entry);
4819+
let (shutdown, monitor_update, htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.keys_manager, &their_features, &msg), chan_entry);
48204820
dropped_htlcs = htlcs;
48214821

48224822
// Update the monitor with the shutdown script if necessary.
@@ -4825,7 +4825,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48254825
let (result, is_permanent) =
48264826
handle_monitor_update_res!(self, update_res, chan_entry.get_mut(), RAACommitmentOrder::CommitmentFirst, chan_entry.key(), NO_UPDATE);
48274827
if is_permanent {
4828-
remove_channel!(self, channel_state, chan_entry);
4828+
remove_channel!(self, chan_entry);
48294829
break result;
48304830
}
48314831
}
@@ -4860,7 +4860,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48604860
if chan_entry.get().get_counterparty_node_id() != *counterparty_node_id {
48614861
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
48624862
}
4863-
let (closing_signed, tx) = try_chan_entry!(self, chan_entry.get_mut().closing_signed(&self.fee_estimator, &msg), channel_state, chan_entry);
4863+
let (closing_signed, tx) = try_chan_entry!(self, chan_entry.get_mut().closing_signed(&self.fee_estimator, &msg), chan_entry);
48644864
if let Some(msg) = closing_signed {
48654865
channel_state.pending_msg_events.push(events::MessageSendEvent::SendClosingSigned {
48664866
node_id: counterparty_node_id.clone(),
@@ -4873,7 +4873,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48734873
// also implies there are no pending HTLCs left on the channel, so we can
48744874
// fully delete it from tracking (the channel monitor is still around to
48754875
// watch for old state broadcasts)!
4876-
(tx, Some(remove_channel!(self, channel_state, chan_entry)))
4876+
(tx, Some(remove_channel!(self, chan_entry)))
48774877
} else { (tx, None) }
48784878
},
48794879
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
@@ -4937,7 +4937,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49374937
_ => pending_forward_info
49384938
}
49394939
};
4940-
try_chan_entry!(self, chan.get_mut().update_add_htlc(&msg, pending_forward_info, create_pending_htlc_status, &self.logger), channel_state, chan);
4940+
try_chan_entry!(self, chan.get_mut().update_add_htlc(&msg, pending_forward_info, create_pending_htlc_status, &self.logger), chan);
49414941
},
49424942
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49434943
}
@@ -4953,7 +4953,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49534953
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
49544954
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
49554955
}
4956-
try_chan_entry!(self, chan.get_mut().update_fulfill_htlc(&msg), channel_state, chan)
4956+
try_chan_entry!(self, chan.get_mut().update_fulfill_htlc(&msg), chan)
49574957
},
49584958
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49594959
}
@@ -4970,7 +4970,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49704970
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
49714971
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
49724972
}
4973-
try_chan_entry!(self, chan.get_mut().update_fail_htlc(&msg, HTLCFailReason::LightningError { err: msg.reason.clone() }), channel_state, chan);
4973+
try_chan_entry!(self, chan.get_mut().update_fail_htlc(&msg, HTLCFailReason::LightningError { err: msg.reason.clone() }), chan);
49744974
},
49754975
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49764976
}
@@ -4987,9 +4987,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49874987
}
49884988
if (msg.failure_code & 0x8000) == 0 {
49894989
let chan_err: ChannelError = ChannelError::Close("Got update_fail_malformed_htlc with BADONION not set".to_owned());
4990-
try_chan_entry!(self, Err(chan_err), channel_state, chan);
4990+
try_chan_entry!(self, Err(chan_err), chan);
49914991
}
4992-
try_chan_entry!(self, chan.get_mut().update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() }), channel_state, chan);
4992+
try_chan_entry!(self, chan.get_mut().update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() }), chan);
49934993
Ok(())
49944994
},
49954995
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
@@ -5006,11 +5006,11 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
50065006
}
50075007
let (revoke_and_ack, commitment_signed, monitor_update) =
50085008
match chan.get_mut().commitment_signed(&msg, &self.logger) {
5009-
Err((None, e)) => try_chan_entry!(self, Err(e), channel_state, chan),
5009+
Err((None, e)) => try_chan_entry!(self, Err(e), chan),
50105010
Err((Some(update), e)) => {
50115011
assert!(chan.get().is_awaiting_monitor_update());
50125012
let _ = self.chain_monitor.update_channel(chan.get().get_funding_txo().unwrap(), update);
5013-
try_chan_entry!(self, Err(e), channel_state, chan);
5013+
try_chan_entry!(self, Err(e), chan);
50145014
unreachable!();
50155015
},
50165016
Ok(res) => res
@@ -5093,7 +5093,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
50935093
}
50945094
let was_paused_for_mon_update = chan.get().is_awaiting_monitor_update();
50955095
let raa_updates = break_chan_entry!(self,
5096-
chan.get_mut().revoke_and_ack(&msg, &self.logger), channel_state, chan);
5096+
chan.get_mut().revoke_and_ack(&msg, &self.logger), chan);
50975097
htlcs_to_fail = raa_updates.holding_cell_failed_htlcs;
50985098
let update_res = self.chain_monitor.update_channel(chan.get().get_funding_txo().unwrap(), raa_updates.monitor_update);
50995099
if was_paused_for_mon_update {
@@ -5153,7 +5153,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
51535153
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
51545154
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
51555155
}
5156-
try_chan_entry!(self, chan.get_mut().update_fee(&self.fee_estimator, &msg), channel_state, chan);
5156+
try_chan_entry!(self, chan.get_mut().update_fee(&self.fee_estimator, &msg), chan);
51575157
},
51585158
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
51595159
}
@@ -5175,7 +5175,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
51755175

51765176
channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
51775177
msg: try_chan_entry!(self, chan.get_mut().announcement_signatures(
5178-
self.get_our_node_id(), self.genesis_hash.clone(), self.best_block.read().unwrap().height(), msg), channel_state, chan),
5178+
self.get_our_node_id(), self.genesis_hash.clone(), self.best_block.read().unwrap().height(), msg), chan),
51795179
// Note that announcement_signatures fails if the channel cannot be announced,
51805180
// so get_channel_update_for_broadcast will never fail by the time we get here.
51815181
update_msg: self.get_channel_update_for_broadcast(chan.get()).unwrap(),
@@ -5214,7 +5214,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
52145214
return Ok(NotifyOption::SkipPersist);
52155215
} else {
52165216
log_debug!(self.logger, "Received channel_update for channel {}.", log_bytes!(chan_id));
5217-
try_chan_entry!(self, chan.get_mut().channel_update(&msg), channel_state, chan);
5217+
try_chan_entry!(self, chan.get_mut().channel_update(&msg), chan);
52185218
}
52195219
},
52205220
hash_map::Entry::Vacant(_) => unreachable!()
@@ -5239,7 +5239,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
52395239
// add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
52405240
let responses = try_chan_entry!(self, chan.get_mut().channel_reestablish(
52415241
msg, &self.logger, self.our_network_pubkey.clone(), self.genesis_hash,
5242-
&*self.best_block.read().unwrap()), channel_state, chan);
5242+
&*self.best_block.read().unwrap()), chan);
52435243
let mut channel_update = None;
52445244
if let Some(msg) = responses.shutdown_msg {
52455245
channel_state.pending_msg_events.push(events::MessageSendEvent::SendShutdown {
@@ -5303,7 +5303,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
53035303
let by_id = &mut channel_state.by_id;
53045304
let pending_msg_events = &mut channel_state.pending_msg_events;
53055305
if let hash_map::Entry::Occupied(chan_entry) = by_id.entry(funding_outpoint.to_channel_id()) {
5306-
let mut chan = remove_channel!(self, channel_state, chan_entry);
5306+
let mut chan = remove_channel!(self, chan_entry);
53075307
failed_channels.push(chan.force_shutdown(false));
53085308
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
53095309
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {

0 commit comments

Comments
 (0)