lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hsmd: rename hsm_client_wire_csv to hsm_wire.csv 

That matches the other CSV names (HSM was the first, so it was written
before the pattern emerged).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
json-streaming
Rusty Russell 7 years ago
committed by Christian Decker
parent
8f1f1784b3
commit
e012e94ab2
27 changed files with 33 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      channeld/Makefile
  2. 6
      channeld/channeld.c
  3. 2
      closingd/Makefile
  4. 2
      closingd/closingd.c
  5. 2
      common/bolt11.c
  6. 2
      connectd/Makefile
  7. 2
      connectd/connectd.c
  8. 2
      gossipd/Makefile
  9. 2
      gossipd/gossipd.c
  10. 12
      hsmd/Makefile
  11. 0
      hsmd/hsm_wire.csv
  12. 6
      hsmd/hsmd.c
  13. 2
      lightningd/Makefile
  14. 2
      lightningd/channel.c
  15. 2
      lightningd/channel_control.c
  16. 2
      lightningd/connect_control.c
  17. 2
      lightningd/gossip_control.c
  18. 4
      lightningd/hsm_control.c
  19. 2
      lightningd/invoice.c
  20. 2
      lightningd/onchain_control.c
  21. 2
      lightningd/opening_control.c
  22. 2
      lightningd/peer_control.c
  23. 2
      onchaind/Makefile
  24. 2
      onchaind/onchaind.c
  25. 2
      openingd/Makefile
  26. 2
      openingd/openingd.c
  27. 2
      wallet/walletrpc.c

2
channeld/Makefile
View File

@ -72,7 +72,7 @@ CHANNELD_COMMON_OBJS := \
common/wire_error.o \
common/wireaddr.o \
gossipd/gen_gossip_wire.o \
hsmd/gen_hsm_client_wire.o \
hsmd/gen_hsm_wire.o \
lightningd/gossip_msg.o \
wire/fromwire.o \
wire/towire.o

6
channeld/channeld.c
View File

@ -45,7 +45,7 @@
#include <fcntl.h>
#include <gossipd/gen_gossip_wire.h>
#include <gossipd/gossip_constants.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <secp256k1.h>
#include <stdio.h>
@ -223,14 +223,14 @@ static const u8 *hsm_req(const tal_t *ctx, const u8 *req TAKES)
if (!wire_sync_write(HSM_FD, req))
status_failed(STATUS_FAIL_HSM_IO,
"Writing %s to HSM: %s",
hsm_client_wire_type_name(type),
hsm_wire_type_name(type),
strerror(errno));
msg = wire_sync_read(ctx, HSM_FD);
if (!msg)
status_failed(STATUS_FAIL_HSM_IO,
"Reading resp to %s: %s",
hsm_client_wire_type_name(type),
hsm_wire_type_name(type),
strerror(errno));
return msg;

2
closingd/Makefile
View File

@ -72,7 +72,7 @@ CLOSINGD_COMMON_OBJS := \
common/wire_error.o \
common/wireaddr.o \
gossipd/gen_gossip_wire.o \
hsmd/gen_hsm_client_wire.o \
hsmd/gen_hsm_wire.o \
lightningd/gossip_msg.o
closingd/gen_closing_wire.h: $(WIRE_GEN) closingd/closing_wire.csv

2
closingd/closingd.c
View File

@ -15,7 +15,7 @@
#include <common/version.h>
#include <common/wire_error.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <stdio.h>
#include <unistd.h>

2
common/bolt11.c
View File

@ -11,7 +11,7 @@
#include <common/bolt11.h>
#include <common/utils.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/hsm_control.h>
#include <lightningd/jsonrpc.h>

2
connectd/Makefile
View File

@ -61,7 +61,7 @@ CONNECTD_COMMON_OBJS := \
common/wireaddr.o \
common/wire_error.o \
gossipd/gen_gossip_wire.o \
hsmd/gen_hsm_client_wire.o \
hsmd/gen_hsm_wire.o \
lightningd/gossip_msg.o \
wire/gen_onion_wire.o

2
connectd/connectd.c
View File

@ -39,7 +39,7 @@
#include <connectd/tor_autoservice.h>
#include <errno.h>
#include <gossipd/gen_gossip_wire.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/gossip_msg.h>
#include <netdb.h>

2
gossipd/Makefile
View File

@ -61,7 +61,7 @@ GOSSIPD_COMMON_OBJS := \
common/wireaddr.o \
common/wire_error.o \
connectd/gen_connect_gossip_wire.o \
hsmd/gen_hsm_client_wire.o \
hsmd/gen_hsm_wire.o \
lightningd/gossip_msg.o \
wire/gen_onion_wire.o

2
gossipd/gossipd.c
View File

@ -36,7 +36,7 @@
#include <gossipd/broadcast.h>
#include <gossipd/gen_gossip_wire.h>
#include <gossipd/routing.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/gossip_msg.h>
#include <netdb.h>

12
hsmd/Makefile
View File

@ -7,8 +7,8 @@ hsmd-wrongdir:
default: hsmd-all
LIGHTNINGD_HSM_SRC := hsmd/hsmd.c \
hsmd/gen_hsm_client_wire.c
LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_client_wire.h
hsmd/gen_hsm_wire.c
LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_wire.h
LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o)
# Common source we use.
@ -41,18 +41,12 @@ $(LIGHTNINGD_HSM_OBJS): $(LIGHTNINGD_HEADERS)
# Make sure these depend on everything.
ALL_OBJS += $(LIGHTNINGD_HSM_OBJS)
ALL_PROGRAMS += lightningd/lightning_hsmd
ALL_GEN_HEADERS += hsmd/gen_hsm_client_wire.h
ALL_GEN_HEADERS += hsmd/gen_hsm_wire.h
hsmd-all: lightningd/lightning_hsmd
lightningd/lightning_hsmd: $(LIGHTNINGD_HSM_OBJS) $(LIGHTNINGD_LIB_OBJS) $(HSMD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS)
hsmd/gen_hsm_client_wire.h: $(WIRE_GEN) hsmd/hsm_client_wire_csv
$(WIRE_GEN) --header $@ hsm_client_wire_type < hsmd/hsm_client_wire_csv > $@
hsmd/gen_hsm_client_wire.c: $(WIRE_GEN) hsmd/hsm_client_wire_csv
$(WIRE_GEN) ${@:.c=.h} hsm_client_wire_type< hsmd/hsm_client_wire_csv > $@
hsmd/gen_hsm_wire.h: $(WIRE_GEN) hsmd/hsm_wire.csv
$(WIRE_GEN) --header $@ hsm_wire_type < hsmd/hsm_wire.csv > $@

0
hsmd/hsm_client_wire_csv → hsmd/hsm_wire.csv
View File

Can't render this file because it has a wrong number of fields in line 2.

6
hsmd/hsmd.c
View File

@ -31,7 +31,7 @@
#include <errno.h>
#include <fcntl.h>
#include <hsmd/capabilities.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <secp256k1_ecdh.h>
#include <sodium/randombytes.h>
@ -1131,7 +1131,7 @@ static struct io_plan *handle_sign_node_announcement(struct io_conn *conn,
}
static bool check_client_capabilities(struct client *client,
enum hsm_client_wire_type t)
enum hsm_wire_type t)
{
switch (t) {
case WIRE_HSM_ECDH_REQ:
@ -1193,7 +1193,7 @@ static struct io_plan *handle_client(struct io_conn *conn,
struct daemon_conn *dc)
{
struct client *c = container_of(dc, struct client, dc);
enum hsm_client_wire_type t = fromwire_peektype(dc->msg_in);
enum hsm_wire_type t = fromwire_peektype(dc->msg_in);
status_debug("Client: Received message %d from client", t);

2
lightningd/Makefile
View File

@ -49,7 +49,7 @@ LIGHTNINGD_COMMON_OBJS := \
common/wire_error.o \
common/wireaddr.o \
common/withdraw_tx.o \
hsmd/gen_hsm_client_wire.o
hsmd/gen_hsm_wire.o
LIGHTNINGD_SRC := \
lightningd/bitcoind.c \

2
lightningd/channel.c
View File

@ -4,7 +4,7 @@
#include <common/wire_error.h>
#include <connectd/gen_connect_wire.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/channel.h>
#include <lightningd/connect_control.h>

2
lightningd/channel_control.c
View File

@ -7,7 +7,7 @@
#include <common/wire_error.h>
#include <errno.h>
#include <gossipd/gossip_constants.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/channel_control.h>
#include <lightningd/closing_control.h>

2
lightningd/connect_control.c
View File

@ -11,7 +11,7 @@
#include <connectd/gen_connect_wire.h>
#include <errno.h>
#include <hsmd/capabilities.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <lightningd/channel.h>
#include <lightningd/connect_control.h>
#include <lightningd/json.h>

2
lightningd/gossip_control.c
View File

@ -17,7 +17,7 @@
#include <errno.h>
#include <gossipd/gen_gossip_wire.h>
#include <hsmd/capabilities.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/connect_control.h>
#include <lightningd/gossip_msg.h>

4
lightningd/hsm_control.c
View File

@ -8,7 +8,7 @@
#include <common/status.h>
#include <common/utils.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/hsm_control.h>
#include <lightningd/log.h>
@ -71,7 +71,7 @@ void hsm_init(struct lightningd *ld)
err(1, "Could not create hsm socketpair");
ld->hsm = new_global_subd(ld, "lightning_hsmd",
hsm_client_wire_type_name,
hsm_wire_type_name,
hsm_msg,
take(&fds[1]), NULL);
if (!ld->hsm)

2
lightningd/invoice.c
View File

@ -13,7 +13,7 @@
#include <common/json_escaped.h>
#include <common/utils.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/hsm_control.h>
#include <lightningd/jsonrpc_errors.h>

2
lightningd/onchain_control.c
View File

@ -2,7 +2,7 @@
#include <bitcoin/script.h>
#include <common/key_derive.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/chaintopology.h>
#include <lightningd/hsm_control.h>

2
lightningd/opening_control.c
View File

@ -8,7 +8,7 @@
#include <common/wire_error.h>
#include <connectd/gen_connect_wire.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <lightningd/chaintopology.h>
#include <lightningd/channel_control.h>
#include <lightningd/closing_control.h>

2
lightningd/peer_control.c
View File

@ -23,7 +23,7 @@
#include <connectd/gen_connect_wire.h>
#include <errno.h>
#include <fcntl.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/bitcoind.h>
#include <lightningd/chaintopology.h>

2
onchaind/Makefile
View File

@ -69,7 +69,7 @@ ONCHAIND_COMMON_OBJS := \
common/utils.o \
common/utxo.o \
common/version.o \
hsmd/gen_hsm_client_wire.o
hsmd/gen_hsm_wire.o
onchaind/gen_onchain_wire.h: $(WIRE_GEN) onchaind/onchain_wire.csv
$(WIRE_GEN) --header $@ onchain_wire_type < onchaind/onchain_wire.csv > $@

2
onchaind/onchaind.c
View File

@ -15,7 +15,7 @@
#include <common/utils.h>
#include <common/version.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/channel_state.h>
#include <onchaind/gen_onchain_wire.h>

2
openingd/Makefile
View File

@ -70,7 +70,7 @@ OPENINGD_COMMON_OBJS := \
common/wire_error.o \
common/wireaddr.o \
gossipd/gen_gossip_wire.o \
hsmd/gen_hsm_client_wire.o \
hsmd/gen_hsm_wire.o \
lightningd/gossip_msg.o
$(LIGHTNINGD_OPENING_OBJS): $(LIGHTNINGD_HEADERS)

2
openingd/openingd.c
View File

@ -23,7 +23,7 @@
#include <common/version.h>
#include <common/wire_error.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <openingd/gen_opening_wire.h>
#include <poll.h>

2
wallet/walletrpc.c
View File

@ -9,7 +9,7 @@
#include <common/wallet_tx.h>
#include <common/withdraw_tx.h>
#include <errno.h>
#include <hsmd/gen_hsm_client_wire.h>
#include <hsmd/gen_hsm_wire.h>
#include <inttypes.h>
#include <lightningd/bitcoind.h>
#include <lightningd/chaintopology.h>

Write Preview
Loading…
Cancel
Save