aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 23:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

channeld: trivial refactor of fee_for_htlcs().

Browse Source 
Extract out num_untrimmed_htlcs() from inside fee_for_htlcs(), and
remove unused view arg.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-02-11 17:56:14 +10:30
committed by Christian Decker
parent 6efde31ade
commit 02565bcbea
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
channeld/full_channel.c
View File

@@ -363,8 +363,19 @@ static bool get_room_above_reserve(const struct channel *channel,
return true;
}
static size_t num_untrimmed_htlcs(enum side side,
struct amount_sat dust_limit,
u32 feerate,
const struct htlc **committed,
const struct htlc **adding,
const struct htlc **removing)
{
return commit_tx_num_untrimmed(committed, feerate, dust_limit, side)
+ commit_tx_num_untrimmed(adding, feerate, dust_limit, side)
- commit_tx_num_untrimmed(removing, feerate, dust_limit, side);
}
static struct amount_sat fee_for_htlcs(const struct channel *channel,
const struct channel_view *view,
const struct htlc **committed,
const struct htlc **adding,
const struct htlc **removing,
@@ -374,12 +385,8 @@ static struct amount_sat fee_for_htlcs(const struct channel *channel,
struct amount_sat dust_limit = channel->config[side].dust_limit;
size_t untrimmed;
untrimmed = commit_tx_num_untrimmed(committed, feerate, dust_limit,
side)
+ commit_tx_num_untrimmed(adding, feerate, dust_limit,
side)
- commit_tx_num_untrimmed(removing, feerate, dust_limit,
side);
untrimmed = num_untrimmed_htlcs(side, dust_limit, feerate,
committed, adding, removing);
return commit_tx_base_fee(feerate, untrimmed);
}
@@ -536,7 +543,7 @@ static enum channel_add_err add_htlc(struct channel *channel,
*/
if (enforce_aggregate_limits) {
struct amount_msat remainder;
struct amount_sat fee = fee_for_htlcs(channel, view,
struct amount_sat fee = fee_for_htlcs(channel,
committed,
adding,
removing,
@@ -578,7 +585,7 @@ static enum channel_add_err add_htlc(struct channel *channel,
/* Should be able to afford both their own commit tx
* fee, and other's commit tx fee, which are subtly
* different! */
fee = fee_for_htlcs(channel, view,
fee = fee_for_htlcs(channel,
committed,
adding,
removing,
@@ -596,7 +603,7 @@ static enum channel_add_err add_htlc(struct channel *channel,
&remainder));
return CHANNEL_ERR_CHANNEL_CAPACITY_EXCEEDED;
}
fee = fee_for_htlcs(channel, view,
fee = fee_for_htlcs(channel,
committed,
adding,
removing,