Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

option_data_loss_protect: reenable by default #2283

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

- The `short_channel_id` separator has been changed to be `x` to match the specification.
- JSON API: `listpeers` now includes `funding_allocation_msat`, which returns a map of the amounts initially funded to the channel by each peer, indexed by channel id.
- `option_data_loss_protect` is now enabled by default.

### Deprecated

Expand Down
2 changes: 0 additions & 2 deletions common/features.c
Expand Up @@ -4,9 +4,7 @@
#include <wire/peer_wire.h>

static const u32 our_localfeatures[] = {
#if EXPERIMENTAL_FEATURES
LOCAL_DATA_LOSS_PROTECT,
#endif
LOCAL_INITIAL_ROUTING_SYNC,
LOCAL_GOSSIP_QUERIES
};
Expand Down
8 changes: 2 additions & 6 deletions tests/test_connection.py
@@ -1,7 +1,7 @@
from collections import namedtuple
from fixtures import * # noqa: F401,F403
from lightning import RpcError
from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND, EXPERIMENTAL_FEATURES
from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND


import os
Expand Down Expand Up @@ -1009,10 +1009,7 @@ def test_forget_channel(node_factory):

def test_peerinfo(node_factory, bitcoind):
l1, l2 = node_factory.line_graph(2, fundchannel=False, opts={'may_reconnect': True})
if EXPERIMENTAL_FEATURES:
lfeatures = '8a'
else:
lfeatures = '88'
lfeatures = '8a'
# Gossiping but no node announcement yet
assert l1.rpc.getpeer(l2.info['id'])['connected']
assert len(l1.rpc.getpeer(l2.info['id'])['channels']) == 0
Expand Down Expand Up @@ -1255,7 +1252,6 @@ def test_funder_simple_reconnect(node_factory, bitcoind):


@unittest.skipIf(not DEVELOPER, "needs LIGHTNINGD_DEV_LOG_IO")
@unittest.skipIf(not EXPERIMENTAL_FEATURES, "needs option_data_loss_protect")
def test_dataloss_protection(node_factory, bitcoind):
l1 = node_factory.get_node(may_reconnect=True, log_all_io=True,
feerates=(7500, 7500, 7500))
Expand Down