mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

listtransactions: don't create a msat field called "satoshis".

Browse Source 
That's a terrible, terrible idea.  (Documentation comes in later patch
which has the schema).

Also, blockheight is a u32, so simplify.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: JSON-RPC: `listtransactions` `outputs` `satoshis` field (use `msat` instead).
This commit is contained in:
Rusty Russell 2021-06-16 10:31:17 +09:30
parent d8136d856b
commit 0a99b8c64c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_wallet.py
View File

@ -937,7 +937,7 @@ def test_transaction_annotations(node_factory, bitcoind):
assert(len(txs) == 1)
tx = txs[0]
output = tx['outputs'][idx]
assert(output['type'] == 'deposit' and output['satoshis'] == '1000000000msat')
assert(output['type'] == 'deposit' and output['msat'] == Millisatoshi(1000000000))
# ... and all other output should be change, and have no annotations
types = []

6
wallet/walletrpc.c
View File

@ -506,7 +506,7 @@ static void json_transaction_details(struct json_stream *response,
json_object_start(response, NULL);
json_add_txid(response, "hash", &tx->id);
json_add_hex_talarr(response, "rawtx", tx->rawtx);
json_add_u64(response, "blockheight", tx->blockheight);
json_add_num(response, "blockheight", tx->blockheight);
json_add_num(response, "txindex", tx->txindex);
#if EXPERIMENTAL_FEATURES
if (tx->annotation.type != 0)
@ -556,7 +556,9 @@ static void json_transaction_details(struct json_stream *response,
json_object_start(response, NULL);
json_add_u32(response, "index", i);
json_add_amount_sat_only(response, "satoshis", sat);
if (deprecated_apis)
json_add_amount_sat_only(response, "satoshis", sat);
json_add_amount_sat_only(response, "msat", sat);
#if EXPERIMENTAL_FEATURES
struct tx_annotation *ann = &tx->output_annotations[i];