Skip to content

Commit 1fd1713

Browse files
dunxendunxen
committed
Rename channel_by_id map to funded_channel_by_id 
1 parent 2cbc914 commit 1fd1713

8 files changed

+92
-93
lines changed

‎lightning/src/ln/chanmon_update_fail_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::chain::channelmonitor::{ANTI_REORG_DELAY, ChannelMonitor};
2020
use crate::chain::transaction::OutPoint;
2121
use crate::chain::{ChannelMonitorUpdateStatus, Listen, Watch};
2222
use crate::ln::channelmanager::{ChannelManager, RAACommitmentOrder, PaymentSendFailure, PaymentId};
23-
use crate::ln::channel::{AnnouncementSigsState, ChannelInterface};
23+
use crate::ln::channel::{AnnouncementSigsState};
2424
use crate::ln::msgs;
2525
use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
2626
use crate::util::enforcing_trait_impls::EnforcingSigner;

‎lightning/src/ln/channelmanager.rs

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

‎lightning/src/ln/functional_test_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ macro_rules! get_channel_ref {
689689
{
690690
$per_peer_state_lock = $node.node.per_peer_state.read().unwrap();
691691
$peer_state_lock = $per_peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
692-
$peer_state_lock.channel_by_id.get_mut(&$channel_id).unwrap()
692+
$peer_state_lock.funded_channel_by_id.get_mut(&$channel_id).unwrap()
693693
}
694694
}
695695
}
@@ -2090,7 +2090,7 @@ pub fn do_claim_payment_along_route<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>,
20902090
let per_peer_state = $node.node.per_peer_state.read().unwrap();
20912091
let peer_state = per_peer_state.get(&$prev_node.node.get_our_node_id())
20922092
.unwrap().lock().unwrap();
2093-
let channel = peer_state.channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
2093+
let channel = peer_state.funded_channel_by_id.get(&next_msgs.as_ref().unwrap().0.channel_id).unwrap();
20942094
if let Some(prev_config) = channel.prev_config() {
20952095
prev_config.forwarding_fee_base_msat
20962096
} else {
@@ -2592,7 +2592,7 @@ macro_rules! get_channel_value_stat {
25922592
($node: expr, $counterparty_node: expr, $channel_id: expr) => {{
25932593
let peer_state_lock = $node.node.per_peer_state.read().unwrap();
25942594
let chan_lock = peer_state_lock.get(&$counterparty_node.node.get_our_node_id()).unwrap().lock().unwrap();
2595-
let chan = chan_lock.channel_by_id.get(&$channel_id).unwrap();
2595+
let chan = chan_lock.funded_channel_by_id.get(&$channel_id).unwrap();
25962596
chan.get_value_stat()
25972597
}}
25982598
}

‎lightning/src/ln/functional_tests.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ fn test_update_fee_that_funder_cannot_afford() {
692692
let (local_revocation_basepoint, local_htlc_basepoint, local_funding) = {
693693
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
694694
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
695-
let local_chan = chan_lock.channel_by_id.get(&chan.2).unwrap();
695+
let local_chan = chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
696696
let chan_signer = local_chan.get_signer();
697697
let pubkeys = chan_signer.pubkeys();
698698
(pubkeys.revocation_basepoint, pubkeys.htlc_basepoint,
@@ -701,7 +701,7 @@ fn test_update_fee_that_funder_cannot_afford() {
701701
let (remote_delayed_payment_basepoint, remote_htlc_basepoint,remote_point, remote_funding) = {
702702
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
703703
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
704-
let remote_chan = chan_lock.channel_by_id.get(&chan.2).unwrap();
704+
let remote_chan = chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
705705
let chan_signer = remote_chan.get_signer();
706706
let pubkeys = chan_signer.pubkeys();
707707
(pubkeys.delayed_payment_basepoint, pubkeys.htlc_basepoint,
@@ -716,7 +716,7 @@ fn test_update_fee_that_funder_cannot_afford() {
716716
let res = {
717717
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
718718
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
719-
let local_chan = local_chan_lock.channel_by_id.get(&chan.2).unwrap();
719+
let local_chan = local_chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
720720
let local_chan_signer = local_chan.get_signer();
721721
let mut htlcs: Vec<(HTLCOutputInCommitment, ())> = vec![];
722722
let commitment_tx = CommitmentTransaction::new_with_auxiliary_htlc_data(
@@ -1394,7 +1394,7 @@ fn test_fee_spike_violation_fails_htlc() {
13941394
let (local_revocation_basepoint, local_htlc_basepoint, local_secret, next_local_point, local_funding) = {
13951395
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
13961396
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
1397-
let local_chan = chan_lock.channel_by_id.get(&chan.2).unwrap();
1397+
let local_chan = chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
13981398
let chan_signer = local_chan.get_signer();
13991399
// Make the signer believe we validated another commitment, so we can release the secret
14001400
chan_signer.get_enforcement_state().last_holder_commitment -= 1;
@@ -1408,7 +1408,7 @@ fn test_fee_spike_violation_fails_htlc() {
14081408
let (remote_delayed_payment_basepoint, remote_htlc_basepoint, remote_point, remote_funding) = {
14091409
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
14101410
let chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
1411-
let remote_chan = chan_lock.channel_by_id.get(&chan.2).unwrap();
1411+
let remote_chan = chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
14121412
let chan_signer = remote_chan.get_signer();
14131413
let pubkeys = chan_signer.pubkeys();
14141414
(pubkeys.delayed_payment_basepoint, pubkeys.htlc_basepoint,
@@ -1437,7 +1437,7 @@ fn test_fee_spike_violation_fails_htlc() {
14371437
let res = {
14381438
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
14391439
let local_chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
1440-
let local_chan = local_chan_lock.channel_by_id.get(&chan.2).unwrap();
1440+
let local_chan = local_chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
14411441
let local_chan_signer = local_chan.get_signer();
14421442
let commitment_tx = CommitmentTransaction::new_with_auxiliary_htlc_data(
14431443
commitment_number,
@@ -3080,7 +3080,7 @@ fn do_test_commitment_revoked_fail_backward_exhaustive(deliver_bs_raa: bool, use
30803080
// The dust limit applied to HTLC outputs considers the fee of the HTLC transaction as
30813081
// well, so HTLCs at exactly the dust limit will not be included in commitment txn.
30823082
nodes[2].node.per_peer_state.read().unwrap().get(&nodes[1].node.get_our_node_id())
3083-
.unwrap().lock().unwrap().channel_by_id.get(&chan_2.2).unwrap().context.holder_dust_limit_satoshis * 1000
3083+
.unwrap().lock().unwrap().funded_channel_by_id.get(&chan_2.2).unwrap().context.holder_dust_limit_satoshis * 1000
30843084
} else { 3000000 };
30853085

30863086
let (_, first_payment_hash, _) = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], value);
@@ -4947,7 +4947,7 @@ fn do_test_fail_backwards_unrevoked_remote_announce(deliver_last_raa: bool, anno
49474947
assert_eq!(get_local_commitment_txn!(nodes[3], chan_2_3.2)[0].output.len(), 2);
49484948

49494949
let ds_dust_limit = nodes[3].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
4950-
.unwrap().lock().unwrap().channel_by_id.get(&chan_2_3.2).unwrap().context.holder_dust_limit_satoshis;
4950+
.unwrap().lock().unwrap().funded_channel_by_id.get(&chan_2_3.2).unwrap().context.holder_dust_limit_satoshis;
49514951
// 0th HTLC:
49524952
let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[2], &nodes[3], &nodes[4]], ds_dust_limit*1000); // not added < dust limit + HTLC tx fee
49534953
// 1st HTLC:
@@ -6060,7 +6060,7 @@ fn test_update_add_htlc_bolt2_sender_exceed_max_htlc_num_and_htlc_id_increment()
60606060
let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
60616061
let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1000000, 0);
60626062
let max_accepted_htlcs = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
6063-
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context.counterparty_max_accepted_htlcs as u64;
6063+
.unwrap().lock().unwrap().funded_channel_by_id.get(&chan.2).unwrap().context.counterparty_max_accepted_htlcs as u64;
60646064

60656065
for i in 0..max_accepted_htlcs {
60666066
let (route, our_payment_hash, _, our_payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[1], 100000);
@@ -6131,7 +6131,7 @@ fn test_update_add_htlc_bolt2_receiver_check_amount_received_more_than_min() {
61316131
{
61326132
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
61336133
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
6134-
let channel = chan_lock.channel_by_id.get(&chan.2).unwrap();
6134+
let channel = chan_lock.funded_channel_by_id.get(&chan.2).unwrap();
61356135
htlc_minimum_msat = channel.get_holder_htlc_minimum_msat();
61366136
}
61376137

@@ -6715,7 +6715,7 @@ fn do_test_failure_delay_dust_htlc_local_commitment(announce_latest: bool) {
67156715
let chan =create_announced_chan_between_nodes(&nodes, 0, 1);
67166716

67176717
let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
6718-
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context.holder_dust_limit_satoshis;
6718+
.unwrap().lock().unwrap().funded_channel_by_id.get(&chan.2).unwrap().context.holder_dust_limit_satoshis;
67196719

67206720
// We route 2 dust-HTLCs between A and B
67216721
let (_, payment_hash_1, _) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
@@ -6808,7 +6808,7 @@ fn do_test_sweep_outbound_htlc_failure_update(revoked: bool, local: bool) {
68086808
let chan = create_announced_chan_between_nodes(&nodes, 0, 1);
68096809

68106810
let bs_dust_limit = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[0].node.get_our_node_id())
6811-
.unwrap().lock().unwrap().channel_by_id.get(&chan.2).unwrap().context.holder_dust_limit_satoshis;
6811+
.unwrap().lock().unwrap().funded_channel_by_id.get(&chan.2).unwrap().context.holder_dust_limit_satoshis;
68126812

68136813
let (_payment_preimage_1, dust_hash, _payment_secret_1) = route_payment(&nodes[0], &[&nodes[1]], bs_dust_limit*1000);
68146814
let (_payment_preimage_2, non_dust_hash, _payment_secret_2) = route_payment(&nodes[0], &[&nodes[1]], 1000000);
@@ -7473,7 +7473,7 @@ fn test_counterparty_raa_skip_no_crash() {
74737473
{
74747474
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
74757475
let mut guard = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
7476-
let keys = guard.channel_by_id.get_mut(&channel_id).unwrap().get_signer();
7476+
let keys = guard.funded_channel_by_id.get_mut(&channel_id).unwrap().get_signer();
74777477

74787478
const INITIAL_COMMITMENT_NUMBER: u64 = (1 << 48) - 1;
74797479

@@ -8727,7 +8727,7 @@ fn test_duplicate_chan_id() {
87278727
// another channel in the ChannelManager - an invalid state. Thus, we'd panic later when we
87288728
// try to create another channel. Instead, we drop the channel entirely here (leaving the
87298729
// channelmanager in a possibly nonsense state instead).
8730-
let mut as_chan = a_peer_state.channel_by_id.remove(&open_chan_2_msg.temporary_channel_id).unwrap();
8730+
let mut as_chan = a_peer_state.funded_channel_by_id.remove(&open_chan_2_msg.temporary_channel_id).unwrap();
87318731
let logger = test_utils::TestLogger::new();
87328732
as_chan.get_outbound_funding_created(tx.clone(), funding_outpoint, &&logger).unwrap()
87338733
};
@@ -9418,7 +9418,7 @@ fn do_test_max_dust_htlc_exposure(dust_outbound_balance: bool, exposure_breach_e
94189418
let dust_buffer_feerate = {
94199419
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
94209420
let chan_lock = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
9421-
let chan = chan_lock.channel_by_id.get(&channel_id).unwrap();
9421+
let chan = chan_lock.funded_channel_by_id.get(&channel_id).unwrap();
94229422
chan.get_dust_buffer_feerate(None) as u64
94239423
};
94249424
let dust_outbound_htlc_on_holder_tx_msat: u64 = (dust_buffer_feerate * htlc_timeout_tx_weight(opt_anchors) / 1000 + open_channel.dust_limit_satoshis - 1) * 1000;

‎lightning/src/ln/onion_route_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ fn test_onion_failure() {
499499

500500
let short_channel_id = channels[1].0.contents.short_channel_id;
501501
let amt_to_forward = nodes[1].node.per_peer_state.read().unwrap().get(&nodes[2].node.get_our_node_id())
502-
.unwrap().lock().unwrap().channel_by_id.get(&channels[1].2).unwrap()
502+
.unwrap().lock().unwrap().funded_channel_by_id.get(&channels[1].2).unwrap()
503503
.get_counterparty_htlc_minimum_msat() - 1;
504504
let mut bogus_route = route.clone();
505505
let route_len = bogus_route.paths[0].len();

‎lightning/src/ln/payment_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ fn do_retry_with_no_persist(confirm_before_reload: bool) {
421421
let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
422422
let mut peer_state = per_peer_state.get(&nodes[2].node.get_our_node_id())
423423
.unwrap().lock().unwrap();
424-
let mut channel = peer_state.channel_by_id.get_mut(&chan_id_2).unwrap();
424+
let mut channel = peer_state.funded_channel_by_id.get_mut(&chan_id_2).unwrap();
425425
let mut new_config = channel.config();
426426
new_config.forwarding_fee_base_msat += 100_000;
427427
channel.update_config(&new_config);

‎lightning/src/ln/reorg_tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
270270
{
271271
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
272272
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
273-
assert_eq!(peer_state.channel_by_id.len(), 1);
273+
assert_eq!(peer_state.funded_channel_by_id.len(), 1);
274274
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 2);
275275
}
276276

@@ -307,7 +307,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
307307
{
308308
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
309309
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
310-
assert_eq!(peer_state.channel_by_id.len(), 0);
310+
assert_eq!(peer_state.funded_channel_by_id.len(), 0);
311311
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
312312
}
313313
}
@@ -359,7 +359,7 @@ fn do_test_unconf_chan(reload_node: bool, reorg_after_reload: bool, use_funding_
359359
{
360360
let per_peer_state = nodes[0].node.per_peer_state.read().unwrap();
361361
let peer_state = per_peer_state.get(&nodes[1].node.get_our_node_id()).unwrap().lock().unwrap();
362-
assert_eq!(peer_state.channel_by_id.len(), 0);
362+
assert_eq!(peer_state.funded_channel_by_id.len(), 0);
363363
assert_eq!(nodes[0].node.short_to_chan_info.read().unwrap().len(), 0);
364364
}
365365
}

‎lightning/src/ln/shutdown_tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
1212
use crate::chain::keysinterface::{EntropySource, SignerProvider};
1313
use crate::chain::transaction::OutPoint;
14-
use crate::ln::channel::ChannelInterface;
1514
use crate::ln::channelmanager::{self, PaymentSendFailure, PaymentId};
1615
use crate::routing::router::{PaymentParameters, get_route};
1716
use crate::ln::msgs;

0 commit comments

Comments
 (0)