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

Minor fixes: feedback from Christian

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-05-25 11:46:03 +09:30
parent 7d5b923719
commit 06bc035f59
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lightningd/peer_control.c
View File

@@ -36,6 +36,7 @@
#include <wire/gen_onion_wire.h> #include <wire/gen_onion_wire.h>
#include <wire/gen_peer_wire.h> #include <wire/gen_peer_wire.h>
/* FIXME: Define serialization primitive for this? */
struct channel_info { struct channel_info {
secp256k1_ecdsa_signature commit_sig; secp256k1_ecdsa_signature commit_sig;
struct channel_config their_config; struct channel_config their_config;

3
lightningd/subd.h
View File

@@ -57,7 +57,8 @@ struct subd {
* @msgname: function to get name from messages * @msgname: function to get name from messages
* @msgcb: function to call when non-fatal message received (or NULL) * @msgcb: function to call when non-fatal message received (or NULL)
* @finished: function to call when it's finished (with exit status). * @finished: function to call when it's finished (with exit status).
* @...: NULL-terminated list of pointers to fds to hand as fd 3, 4... (can be take, if so, set to -1) * @...: NULL-terminated list of pointers to fds to hand as fd 3, 4...
* (can be take, if so, set to -1)
* *
* @msgcb gets called with @fds set to NULL: if it returns a positive number, * @msgcb gets called with @fds set to NULL: if it returns a positive number,
* that many @fds are received before calling again. If it returns -1, the * that many @fds are received before calling again. If it returns -1, the

5
tests/test_lightningd.py
View File

@@ -96,9 +96,8 @@ class NodeFactory(object):
daemon = utils.LightningD(lightning_dir, bitcoind.bitcoin_dir, port=port) daemon = utils.LightningD(lightning_dir, bitcoind.bitcoin_dir, port=port)
# If we have a disconnect string, dump it to a file for daemon. # If we have a disconnect string, dump it to a file for daemon.
if disconnect: if disconnect:
with open(os.path.join(lightning_dir, "dev_disconnect"), "w") as file: with open(os.path.join(lightning_dir, "dev_disconnect"), "w") as f:
for d in disconnect: f.write("\n".join(disconnect))
file.write(d + "\n")
daemon.cmd_line.append("--dev-disconnect=dev_disconnect") daemon.cmd_line.append("--dev-disconnect=dev_disconnect")
# TODO(cdecker) Move into LIGHTNINGD_CONFIG once legacy daemon was removed # TODO(cdecker) Move into LIGHTNINGD_CONFIG once legacy daemon was removed
daemon.cmd_line.append("--dev-broadcast-interval=1000") daemon.cmd_line.append("--dev-broadcast-interval=1000")