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

lightningd: more updates to match latest BOLT2/3.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-03-07 16:22:34 +10:30
parent fc198e1bac
commit f0c838d250
3 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lightningd/peer_control.c
View File

@@ -858,8 +858,12 @@ static void channel_config(struct lightningd *ld,
*/
ours->to_self_delay = ld->dstate.config.locktime_blocks;
/* Don't care. */
ours->max_accepted_htlcs = 511;
/* BOLT #2:
*
* It MUST fail the channel if `max-accepted-htlcs` is greater than
* 483.
*/
ours->max_accepted_htlcs = 483;
/* This is filled in by lightningd_opening, for consistency. */
ours->channel_reserve_satoshis = 0;

41
lightningd/test/run-channel.c
View File

@@ -40,25 +40,25 @@ static struct sha256_double txid_from_hex(const char *hex)
*
* local_feerate_per_kw: 0
* ...
* local_feerate_per_kw: 676
* local_feerate_per_kw: 647
* ...
* local_feerate_per_kw: 677
* local_feerate_per_kw: 648
* ...
* local_feerate_per_kw: 2161
* local_feerate_per_kw: 2069
* ...
* local_feerate_per_kw: 2162
* local_feerate_per_kw: 2070
* ...
* local_feerate_per_kw: 2291
* local_feerate_per_kw: 2194
* ...
* local_feerate_per_kw: 2292
* local_feerate_per_kw: 2195
* ...
* local_feerate_per_kw: 3866
* local_feerate_per_kw: 3702
* ...
* local_feerate_per_kw: 3867
* local_feerate_per_kw: 3703
* ...
* local_feerate_per_kw: 5133
* local_feerate_per_kw: 4914
* ...
* local_feerate_per_kw: 5134
* local_feerate_per_kw: 4915
* ...
* local_feerate_per_kw: 9651180
* ...
@@ -67,19 +67,12 @@ static struct sha256_double txid_from_hex(const char *hex)
* local_feerate_per_kw: 9651936
*/
static u64 feerates[] = {
0,
676,
677,
2161,
2162,
2291,
2292,
3866,
3867,
5133,
5134,
9651180,
9651181,
647, 648,
2069, 2070,
2194, 2195,
3702, 3703,
4914, 4915,
9651180, 9651181,
9651936
};
@@ -350,7 +343,7 @@ int main(void)
* name: simple commitment tx with no HTLCs
* to_local_msat: 7000000000
* to_remote_msat: 3000000000
* feerate_per_kw: 15000
* local_feerate_per_kw: 15000
*/
to_local_msat = 7000000000;

4
lightningd/test/run-commit_tx.c
View File

@@ -653,7 +653,7 @@ int main(void)
* name: simple commitment tx with no HTLCs
* to_local_msat: 7000000000
* to_remote_msat: 3000000000
* feerate_per_kw: 15000
* local_feerate_per_kw: 15000
*/
to_local_msat = 7000000000;
to_remote_msat = 3000000000;
@@ -662,7 +662,7 @@ int main(void)
"name: simple commitment tx with no HTLCs\n"
"to_local_msat: %"PRIu64"\n"
"to_remote_msat: %"PRIu64"\n"
"feerate_per_kw: %"PRIu64"\n",
"local_feerate_per_kw: %"PRIu64"\n",
to_local_msat, to_remote_msat, feerate_per_kw);
print_superverbose = true;