projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #122 from TheBlueMatt/2018-08-doc-usability-fixes
[rust-lightning]
/
src
/
ln
/
channel.rs
diff --git
a/src/ln/channel.rs
b/src/ln/channel.rs
index e2749ffffb94ba150c7a5c6947b136cef4281f35..c7c3208e78e3007293e7171074f52d555aa1ba60 100644
(file)
--- a/
src/ln/channel.rs
+++ b/
src/ln/channel.rs
@@
-23,7
+23,7
@@
use chain::chaininterface::{FeeEstimator,ConfirmationTarget};
use chain::transaction::OutPoint;
use util::{transaction_utils,rng};
use util::sha2::Sha256;
use chain::transaction::OutPoint;
use util::{transaction_utils,rng};
use util::sha2::Sha256;
-use util::logger::
{Logger, Record}
;
+use util::logger::
Logger
;
use util::errors::APIError;
use std;
use util::errors::APIError;
use std;
@@
-360,7
+360,8
@@
impl Channel {
/// Guaranteed to return a value no larger than channel_value_satoshis
fn get_our_channel_reserve_satoshis(channel_value_satoshis: u64) -> u64 {
/// Guaranteed to return a value no larger than channel_value_satoshis
fn get_our_channel_reserve_satoshis(channel_value_satoshis: u64) -> u64 {
- cmp::min(channel_value_satoshis, 1000) //TODO
+ let (q, _) = channel_value_satoshis.overflowing_div(100);
+ cmp::min(channel_value_satoshis, cmp::max(q, 1000)) //TODO
}
fn derive_our_dust_limit_satoshis(at_open_background_feerate: u64) -> u64 {
}
fn derive_our_dust_limit_satoshis(at_open_background_feerate: u64) -> u64 {
@@
-517,9
+518,6
@@
impl Channel {
if msg.max_accepted_htlcs > 483 {
return_error_message!("max_accpted_htlcs > 483");
}
if msg.max_accepted_htlcs > 483 {
return_error_message!("max_accpted_htlcs > 483");
}
- if (msg.channel_flags & 254) != 0 {
- return Err(HandleError{err: "Unknown channel flags", action: Some(msgs::ErrorAction::IgnoreError) });
- }
// Convert things into internal flags and prep our state:
// Convert things into internal flags and prep our state: