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

chore: adds missing WARN_UNUSED to amount_msat_from_sat_u64

Browse Source
This commit is contained in:
Michael Schmoock
2019-04-15 22:48:08 +02:00
committed by neil saitug
parent c84cade270
commit 2011bcb397
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/amount.c
View File

@@ -375,9 +375,12 @@ void amount_msat_from_u64(struct amount_msat *msat, u64 millisatoshis)
msat->millisatoshis = millisatoshis; msat->millisatoshis = millisatoshis;
} }
void amount_msat_from_sat_u64(struct amount_msat *msat, u64 satoshis) WARN_UNUSED_RESULT bool amount_msat_from_sat_u64(struct amount_msat *msat, u64 satoshis)
{ {
msat->millisatoshis = satoshis * 1000; if (mul_overflows_u64(satoshis, MSAT_PER_SAT))
return false;
msat->millisatoshis = satoshis * MSAT_PER_SAT;
return true;
} }
bool amount_msat_fee(struct amount_msat *fee, bool amount_msat_fee(struct amount_msat *fee,

2
common/amount.h
View File

@@ -104,7 +104,7 @@ WARN_UNUSED_RESULT bool amount_msat_to_u32(struct amount_msat msat,
/* Programatically initialize from various types */ /* Programatically initialize from various types */
void amount_msat_from_u64(struct amount_msat *msat, u64 millisatoshis); void amount_msat_from_u64(struct amount_msat *msat, u64 millisatoshis);
void amount_msat_from_sat_u64(struct amount_msat *msat, u64 satoshis); WARN_UNUSED_RESULT bool amount_msat_from_sat_u64(struct amount_msat *msat, u64 satoshis);
/* Common operation: what is the HTLC fee for given feerate? Can overflow! */ /* Common operation: what is the HTLC fee for given feerate? Can overflow! */
WARN_UNUSED_RESULT bool amount_msat_fee(struct amount_msat *fee, WARN_UNUSED_RESULT bool amount_msat_fee(struct amount_msat *fee,

5
lightningd/opening_control.c
View File

@@ -664,8 +664,9 @@ static void channel_config(struct lightningd *ld,
*max_to_self_delay = ld->config.locktime_max; *max_to_self_delay = ld->config.locktime_max;
/* Take minimal effective capacity from config min_capacity_sat */ /* Take minimal effective capacity from config min_capacity_sat */
amount_msat_from_sat_u64(min_effective_htlc_capacity, if (!amount_msat_from_sat_u64(min_effective_htlc_capacity,
ld->config.min_capacity_sat); ld->config.min_capacity_sat))
fatal("amount_msat overflow for config.min_capacity_sat");
/* BOLT #2: /* BOLT #2:
* *