Skip to content

Commit ce62900

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 b14c13f commit ce62900

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
},
@@ -4559,7 +4559,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
45594559
}
45604560
};
45614561
channel_state.pending_msg_events.push(send_msg_err_event);
4562-
let _ = remove_channel!(self, channel_state, channel);
4562+
let _ = remove_channel!(self, channel);
45634563
return Err(APIError::APIMisuseError { err: "Please use accept_inbound_channel_from_trusted_peer_0conf to accept channels with zero confirmations.".to_owned() });
45644564
}
45654565

@@ -4639,7 +4639,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
46394639
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
46404640
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.temporary_channel_id));
46414641
}
4642-
try_chan_entry!(self, chan.get_mut().accept_channel(&msg, &self.default_configuration.channel_handshake_limits, &their_features), channel_state, chan);
4642+
try_chan_entry!(self, chan.get_mut().accept_channel(&msg, &self.default_configuration.channel_handshake_limits, &their_features), chan);
46434643
(chan.get().get_value_satoshis(), chan.get().get_funding_redeemscript().to_v0_p2wsh(), chan.get().get_user_id())
46444644
},
46454645
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.temporary_channel_id))
@@ -4666,7 +4666,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
46664666
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
46674667
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.temporary_channel_id));
46684668
}
4669-
(try_chan_entry!(self, chan.get_mut().funding_created(msg, best_block, &self.logger), channel_state, chan), chan.remove())
4669+
(try_chan_entry!(self, chan.get_mut().funding_created(msg, best_block, &self.logger), chan), chan.remove())
46704670
},
46714671
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.temporary_channel_id))
46724672
}
@@ -4739,7 +4739,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
47394739
}
47404740
let (monitor, funding_tx, channel_ready) = match chan.get_mut().funding_signed(&msg, best_block, &self.logger) {
47414741
Ok(update) => update,
4742-
Err(e) => try_chan_entry!(self, Err(e), channel_state, chan),
4742+
Err(e) => try_chan_entry!(self, Err(e), chan),
47434743
};
47444744
match self.chain_monitor.watch_channel(chan.get().get_funding_txo().unwrap(), monitor) {
47454745
ChannelMonitorUpdateStatus::Completed => {},
@@ -4778,7 +4778,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
47784778
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
47794779
}
47804780
let announcement_sigs_opt = try_chan_entry!(self, chan.get_mut().channel_ready(&msg, self.get_our_node_id(),
4781-
self.genesis_hash.clone(), &self.best_block.read().unwrap(), &self.logger), channel_state, chan);
4781+
self.genesis_hash.clone(), &self.best_block.read().unwrap(), &self.logger), chan);
47824782
if let Some(announcement_sigs) = announcement_sigs_opt {
47834783
log_trace!(self.logger, "Sending announcement_signatures for channel {}", log_bytes!(chan.get().channel_id()));
47844784
channel_state.pending_msg_events.push(events::MessageSendEvent::SendAnnouncementSignatures {
@@ -4826,7 +4826,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48264826
if chan_entry.get().sent_shutdown() { " after we initiated shutdown" } else { "" });
48274827
}
48284828

4829-
let (shutdown, monitor_update, htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.keys_manager, &their_features, &msg), channel_state, chan_entry);
4829+
let (shutdown, monitor_update, htlcs) = try_chan_entry!(self, chan_entry.get_mut().shutdown(&self.keys_manager, &their_features, &msg), chan_entry);
48304830
dropped_htlcs = htlcs;
48314831

48324832
// Update the monitor with the shutdown script if necessary.
@@ -4835,7 +4835,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48354835
let (result, is_permanent) =
48364836
handle_monitor_update_res!(self, update_res, chan_entry.get_mut(), RAACommitmentOrder::CommitmentFirst, chan_entry.key(), NO_UPDATE);
48374837
if is_permanent {
4838-
remove_channel!(self, channel_state, chan_entry);
4838+
remove_channel!(self, chan_entry);
48394839
break result;
48404840
}
48414841
}
@@ -4870,7 +4870,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48704870
if chan_entry.get().get_counterparty_node_id() != *counterparty_node_id {
48714871
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
48724872
}
4873-
let (closing_signed, tx) = try_chan_entry!(self, chan_entry.get_mut().closing_signed(&self.fee_estimator, &msg), channel_state, chan_entry);
4873+
let (closing_signed, tx) = try_chan_entry!(self, chan_entry.get_mut().closing_signed(&self.fee_estimator, &msg), chan_entry);
48744874
if let Some(msg) = closing_signed {
48754875
channel_state.pending_msg_events.push(events::MessageSendEvent::SendClosingSigned {
48764876
node_id: counterparty_node_id.clone(),
@@ -4883,7 +4883,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
48834883
// also implies there are no pending HTLCs left on the channel, so we can
48844884
// fully delete it from tracking (the channel monitor is still around to
48854885
// watch for old state broadcasts)!
4886-
(tx, Some(remove_channel!(self, channel_state, chan_entry)))
4886+
(tx, Some(remove_channel!(self, chan_entry)))
48874887
} else { (tx, None) }
48884888
},
48894889
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
@@ -4947,7 +4947,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49474947
_ => pending_forward_info
49484948
}
49494949
};
4950-
try_chan_entry!(self, chan.get_mut().update_add_htlc(&msg, pending_forward_info, create_pending_htlc_status, &self.logger), channel_state, chan);
4950+
try_chan_entry!(self, chan.get_mut().update_add_htlc(&msg, pending_forward_info, create_pending_htlc_status, &self.logger), chan);
49514951
},
49524952
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49534953
}
@@ -4963,7 +4963,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49634963
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
49644964
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
49654965
}
4966-
try_chan_entry!(self, chan.get_mut().update_fulfill_htlc(&msg), channel_state, chan)
4966+
try_chan_entry!(self, chan.get_mut().update_fulfill_htlc(&msg), chan)
49674967
},
49684968
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49694969
}
@@ -4980,7 +4980,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49804980
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
49814981
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
49824982
}
4983-
try_chan_entry!(self, chan.get_mut().update_fail_htlc(&msg, HTLCFailReason::LightningError { err: msg.reason.clone() }), channel_state, chan);
4983+
try_chan_entry!(self, chan.get_mut().update_fail_htlc(&msg, HTLCFailReason::LightningError { err: msg.reason.clone() }), chan);
49844984
},
49854985
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
49864986
}
@@ -4997,9 +4997,9 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
49974997
}
49984998
if (msg.failure_code & 0x8000) == 0 {
49994999
let chan_err: ChannelError = ChannelError::Close("Got update_fail_malformed_htlc with BADONION not set".to_owned());
5000-
try_chan_entry!(self, Err(chan_err), channel_state, chan);
5000+
try_chan_entry!(self, Err(chan_err), chan);
50015001
}
5002-
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);
5002+
try_chan_entry!(self, chan.get_mut().update_fail_malformed_htlc(&msg, HTLCFailReason::Reason { failure_code: msg.failure_code, data: Vec::new() }), chan);
50035003
Ok(())
50045004
},
50055005
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
@@ -5016,11 +5016,11 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
50165016
}
50175017
let (revoke_and_ack, commitment_signed, monitor_update) =
50185018
match chan.get_mut().commitment_signed(&msg, &self.logger) {
5019-
Err((None, e)) => try_chan_entry!(self, Err(e), channel_state, chan),
5019+
Err((None, e)) => try_chan_entry!(self, Err(e), chan),
50205020
Err((Some(update), e)) => {
50215021
assert!(chan.get().is_awaiting_monitor_update());
50225022
let _ = self.chain_monitor.update_channel(chan.get().get_funding_txo().unwrap(), update);
5023-
try_chan_entry!(self, Err(e), channel_state, chan);
5023+
try_chan_entry!(self, Err(e), chan);
50245024
unreachable!();
50255025
},
50265026
Ok(res) => res
@@ -5103,7 +5103,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
51035103
}
51045104
let was_paused_for_mon_update = chan.get().is_awaiting_monitor_update();
51055105
let raa_updates = break_chan_entry!(self,
5106-
chan.get_mut().revoke_and_ack(&msg, &self.logger), channel_state, chan);
5106+
chan.get_mut().revoke_and_ack(&msg, &self.logger), chan);
51075107
htlcs_to_fail = raa_updates.holding_cell_failed_htlcs;
51085108
let update_res = self.chain_monitor.update_channel(chan.get().get_funding_txo().unwrap(), raa_updates.monitor_update);
51095109
if was_paused_for_mon_update {
@@ -5163,7 +5163,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
51635163
if chan.get().get_counterparty_node_id() != *counterparty_node_id {
51645164
return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
51655165
}
5166-
try_chan_entry!(self, chan.get_mut().update_fee(&self.fee_estimator, &msg), channel_state, chan);
5166+
try_chan_entry!(self, chan.get_mut().update_fee(&self.fee_estimator, &msg), chan);
51675167
},
51685168
hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
51695169
}
@@ -5185,7 +5185,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
51855185

51865186
channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelAnnouncement {
51875187
msg: try_chan_entry!(self, chan.get_mut().announcement_signatures(
5188-
self.get_our_node_id(), self.genesis_hash.clone(), self.best_block.read().unwrap().height(), msg), channel_state, chan),
5188+
self.get_our_node_id(), self.genesis_hash.clone(), self.best_block.read().unwrap().height(), msg), chan),
51895189
// Note that announcement_signatures fails if the channel cannot be announced,
51905190
// so get_channel_update_for_broadcast will never fail by the time we get here.
51915191
update_msg: self.get_channel_update_for_broadcast(chan.get()).unwrap(),
@@ -5224,7 +5224,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
52245224
return Ok(NotifyOption::SkipPersist);
52255225
} else {
52265226
log_debug!(self.logger, "Received channel_update for channel {}.", log_bytes!(chan_id));
5227-
try_chan_entry!(self, chan.get_mut().channel_update(&msg), channel_state, chan);
5227+
try_chan_entry!(self, chan.get_mut().channel_update(&msg), chan);
52285228
}
52295229
},
52305230
hash_map::Entry::Vacant(_) => unreachable!()
@@ -5249,7 +5249,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
52495249
// add-HTLCs on disconnect, we may be handed HTLCs to fail backwards here.
52505250
let responses = try_chan_entry!(self, chan.get_mut().channel_reestablish(
52515251
msg, &self.logger, self.our_network_pubkey.clone(), self.genesis_hash,
5252-
&*self.best_block.read().unwrap()), channel_state, chan);
5252+
&*self.best_block.read().unwrap()), chan);
52535253
let mut channel_update = None;
52545254
if let Some(msg) = responses.shutdown_msg {
52555255
channel_state.pending_msg_events.push(events::MessageSendEvent::SendShutdown {
@@ -5313,7 +5313,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
53135313
let by_id = &mut channel_state.by_id;
53145314
let pending_msg_events = &mut channel_state.pending_msg_events;
53155315
if let hash_map::Entry::Occupied(chan_entry) = by_id.entry(funding_outpoint.to_channel_id()) {
5316-
let mut chan = remove_channel!(self, channel_state, chan_entry);
5316+
let mut chan = remove_channel!(self, chan_entry);
53175317
failed_channels.push(chan.force_shutdown(false));
53185318
if let Ok(update) = self.get_channel_update_for_broadcast(&chan) {
53195319
pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {

0 commit comments

Comments
 (0)