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

newaddr: don't include "address" field.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Removed: JSON-RPC: `newaddr` no longer includes `address` field (deprecated in 0.7.1)
This commit is contained in:
Rusty Russell
2021-04-07 11:58:05 +09:30
parent da4c2cab62
commit 9c3cf5aff9
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_misc.py
View File

@@ -1771,14 +1771,6 @@ def test_newaddr(node_factory, chainparams):
assert both['bech32'].startswith(chainparams['bip173_prefix']) assert both['bech32'].startswith(chainparams['bip173_prefix'])
def test_newaddr_deprecated(node_factory, chainparams):
l1 = node_factory.get_node(options={'allow-deprecated-apis': True})
p2sh = l1.rpc.newaddr('p2sh-segwit')
assert p2sh['address'].startswith(chainparams['p2sh_prefix'])
bech32 = l1.rpc.newaddr('bech32')
assert bech32['address'].startswith(chainparams['bip173_prefix'])
def test_bitcoind_fail_first(node_factory, bitcoind, executor): def test_bitcoind_fail_first(node_factory, bitcoind, executor):
"""Make sure we handle spurious bitcoin-cli failures during startup """Make sure we handle spurious bitcoin-cli failures during startup

3
wallet/walletrpc.c
View File

@@ -151,9 +151,6 @@ static struct command_result *json_newaddr(struct command *cmd,
} }
response = json_stream_success(cmd); response = json_stream_success(cmd);
if (deprecated_apis && *addrtype != ADDR_ALL)
json_add_string(response, "address",
*addrtype & ADDR_BECH32 ? bech32 : p2sh);
if (*addrtype & ADDR_BECH32) if (*addrtype & ADDR_BECH32)
json_add_string(response, "bech32", bech32); json_add_string(response, "bech32", bech32);
if (*addrtype & ADDR_P2SH_SEGWIT) if (*addrtype & ADDR_P2SH_SEGWIT)