mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 09:40:19 +01:00
Code Issues Projects Releases Wiki Activity

cli: restore 0.7.0-style whitespace printing.

Browse source 
@renepickhardt has a shell script we broke.  While we still produce
perfectly valid JSON, we should not gratuitously change tool output.

Plus, I prefer the missing space before the ':'.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-08-08 12:06:42 +09:30 • committed by ZmnSCPxj, ZmnSCPxj jxPCSmnZ
parent 2f30cdc731
commit 118150227e
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/lightning-cli.c
View file

@ -337,7 +337,7 @@ static void print_json(const char *str, const jsmntok_t *tok, const char *indent
else
printf(",\n%s", next_indent);
print_json(str, t, next_indent);
printf(" : ");
printf(": ");
print_json(str, t + 1, next_indent);
first = false;
}

14
tests/test_misc.py
View file

@ -658,6 +658,20 @@ def test_cli(node_factory):
j = json.loads(out)
assert only_one(j['invoices'])['label'] == 'l"[]{}'
# For those using shell scripts (you know who you are Rene), make sure we're maintaining whitespace
lines = [l for l in out.splitlines() if '"bolt11"' not in l and '"payment_hash"' not in l and '"expires_at"' not in l]
assert lines == ['{',
' "invoices": [',
' {',
r' "label": "l\"[]{}",',
' "msatoshi": 123000,',
' "amount_msat": "123000msat",',
' "status": "unpaid",',
r' "description": "d\"[]{}",',
' }',
' ]',
'}']
def test_daemon_option(node_factory):
"""

2
tests/test_plugin.py
View file

@ -330,7 +330,7 @@ def test_utf8_passthrough(node_factory, executor):
.format(l1.daemon.lightning_dir),
'utf8', 'ナンセンス 1杯']).decode('utf-8')
assert '\\u' not in out
assert out == '{\n "utf8" : "ナンセンス 1杯"\n}\n'
assert out == '{\n "utf8": "ナンセンス 1杯"\n}\n'
def test_invoice_payment_hook(node_factory):