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

Put the 'd' back in the daemons. 

@renepickhardt: why is it actually lightningd.c with a d but hsm.c without d ?

And delete unused gossipd/gossip.h.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
parent
8bc845d7b6
commit
0d46a3d6b0
18 changed files with 13 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      channeld/Makefile
  2. 0
      channeld/channeld.c
  3. 2
      closingd/Makefile
  4. 0
      closingd/closingd.c
  5. 2
      connectd/Makefile
  6. 10
      connectd/connect.h
  7. 2
      connectd/connectd.c
  8. 6
      connectd/connectd.h
  9. 2
      connectd/tor.c
  10. 3
      gossipd/Makefile
  11. 1
      gossipd/gossipd.c
  12. 2
      hsmd/Makefile
  13. 0
      hsmd/hsmd.c
  14. 2
      onchaind/Makefile
  15. 0
      onchaind/onchaind.c
  16. 2
      onchaind/test/run-grind_feerate.c
  17. 2
      openingd/Makefile
  18. 0
      openingd/openingd.c

2
channeld/Makefile
View File

@ -20,7 +20,7 @@ LIGHTNINGD_CHANNEL_HEADERS_NOGEN := \
LIGHTNINGD_CHANNEL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN) LIGHTNINGD_CHANNEL_HEADERS := $(LIGHTNINGD_CHANNEL_HEADERS_GEN) $(LIGHTNINGD_CHANNEL_HEADERS_NOGEN)
LIGHTNINGD_CHANNEL_SRC := channeld/channel.c \ LIGHTNINGD_CHANNEL_SRC := channeld/channeld.c \
channeld/commit_tx.c \ channeld/commit_tx.c \
channeld/full_channel.c \ channeld/full_channel.c \
channeld/gen_channel_wire.c channeld/gen_channel_wire.c

0
channeld/channel.c → channeld/channeld.c
View File

2
closingd/Makefile
View File

@ -16,7 +16,7 @@ LIGHTNINGD_CLOSING_HEADERS_NOGEN :=
LIGHTNINGD_CLOSING_HEADERS := $(LIGHTNINGD_CLOSING_HEADERS_GEN) $(LIGHTNINGD_CLOSING_HEADERS_NOGEN) LIGHTNINGD_CLOSING_HEADERS := $(LIGHTNINGD_CLOSING_HEADERS_GEN) $(LIGHTNINGD_CLOSING_HEADERS_NOGEN)
LIGHTNINGD_CLOSING_SRC := closingd/closing.c \ LIGHTNINGD_CLOSING_SRC := closingd/closingd.c \
$(LIGHTNINGD_CLOSING_HEADERS:.h=.c) $(LIGHTNINGD_CLOSING_HEADERS:.h=.c)
LIGHTNINGD_CLOSING_OBJS := $(LIGHTNINGD_CLOSING_SRC:.c=.o) LIGHTNINGD_CLOSING_OBJS := $(LIGHTNINGD_CLOSING_SRC:.c=.o)

0
closingd/closing.c → closingd/closingd.c
View File

2
connectd/Makefile
View File

@ -14,7 +14,7 @@ LIGHTNINGD_CONNECT_CONTROL_OBJS := $(LIGHTNINGD_CONNECT_CONTROL_SRC:.c=.o)
# connectd needs these: # connectd needs these:
LIGHTNINGD_CONNECT_HEADERS := connectd/gen_connect_wire.h \ LIGHTNINGD_CONNECT_HEADERS := connectd/gen_connect_wire.h \
connectd/gen_connect_gossip_wire.h \ connectd/gen_connect_gossip_wire.h \
connectd/connect.h \ connectd/connectd.h \
connectd/handshake.h \ connectd/handshake.h \
connectd/netaddress.h \ connectd/netaddress.h \
connectd/tor_autoservice.h \ connectd/tor_autoservice.h \

10
connectd/connect.h
View File

@ -1,10 +0,0 @@
#ifndef LIGHTNING_CONNECTD_CONNECT_H
#define LIGHTNING_CONNECTD_CONNECT_H
#include "config.h"
struct io_conn;
struct reaching;
struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
#endif /* LIGHTNING_CONNECTD_CONNECT_H */

2
connectd/connect.c → connectd/connectd.c
View File

@ -30,7 +30,7 @@
#include <common/version.h> #include <common/version.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <connectd/connect.h> #include <connectd/connectd.h>
#include <connectd/gen_connect_gossip_wire.h> #include <connectd/gen_connect_gossip_wire.h>
#include <connectd/gen_connect_wire.h> #include <connectd/gen_connect_wire.h>
#include <connectd/handshake.h> #include <connectd/handshake.h>

6
gossipd/gossip.h → connectd/connectd.h
View File

@ -1,5 +1,5 @@
#ifndef LIGHTNING_GOSSIPD_GOSSIP_H #ifndef LIGHTNING_CONNECTD_CONNECTD_H
#define LIGHTNING_GOSSIPD_GOSSIP_H #define LIGHTNING_CONNECTD_CONNECTD_H
#include "config.h" #include "config.h"
struct io_conn; struct io_conn;
@ -7,4 +7,4 @@ struct reaching;
struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach); struct io_plan *connection_out(struct io_conn *conn, struct reaching *reach);
#endif /* LIGHTNING_GOSSIPD_GOSSIP_H */ #endif /* LIGHTNING_CONNECTD_CONNECTD_H */

2
connectd/tor.c
View File

@ -4,7 +4,7 @@
#include <common/status.h> #include <common/status.h>
#include <common/utils.h> #include <common/utils.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <connectd/connect.h> #include <connectd/connectd.h>
#include <connectd/tor.h> #include <connectd/tor.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>

3
gossipd/Makefile
View File

@ -13,12 +13,11 @@ LIGHTNINGD_GOSSIP_CONTROL_OBJS := $(LIGHTNINGD_GOSSIP_CONTROL_SRC:.c=.o)
# gossipd needs these: # gossipd needs these:
LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \ LIGHTNINGD_GOSSIP_HEADERS := gossipd/gen_gossip_wire.h \
gossipd/gossip.h \
gossipd/gen_gossip_store.h \ gossipd/gen_gossip_store.h \
gossipd/gossip_store.h \ gossipd/gossip_store.h \
gossipd/routing.h \ gossipd/routing.h \
gossipd/broadcast.h gossipd/broadcast.h
LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c) LIGHTNINGD_GOSSIP_SRC := $(LIGHTNINGD_GOSSIP_HEADERS:.h=.c) gossipd/gossipd.c
LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o) LIGHTNINGD_GOSSIP_OBJS := $(LIGHTNINGD_GOSSIP_SRC:.c=.o)
# Make sure these depend on everything. # Make sure these depend on everything.

1
gossipd/gossip.c → gossipd/gossipd.c
View File

@ -35,7 +35,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <gossipd/broadcast.h> #include <gossipd/broadcast.h>
#include <gossipd/gen_gossip_wire.h> #include <gossipd/gen_gossip_wire.h>
#include <gossipd/gossip.h>
#include <gossipd/routing.h> #include <gossipd/routing.h>
#include <hsmd/client.h> #include <hsmd/client.h>
#include <hsmd/gen_hsm_client_wire.h> #include <hsmd/gen_hsm_client_wire.h>

2
hsmd/Makefile
View File

@ -14,7 +14,7 @@ LIGHTNINGD_HSM_CLIENT_OBJS := $(LIGHTNINGD_HSM_CLIENT_SRC:.c=.o)
# lightningd/hsm needs these: # lightningd/hsm needs these:
LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_client_wire.h LIGHTNINGD_HSM_HEADERS := hsmd/gen_hsm_client_wire.h
LIGHTNINGD_HSM_SRC := hsmd/hsm.c \ LIGHTNINGD_HSM_SRC := hsmd/hsmd.c \
$(LIGHTNINGD_HSM_HEADERS:.h=.c) $(LIGHTNINGD_HSM_HEADERS:.h=.c)
LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o) LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o)

0
hsmd/hsm.c → hsmd/hsmd.c
View File

2
onchaind/Makefile
View File

@ -22,7 +22,7 @@ LIGHTNINGD_ONCHAIN_HEADERS_NOGEN := \
LIGHTNINGD_ONCHAIN_HEADERS := $(LIGHTNINGD_ONCHAIN_HEADERS_GEN) $(LIGHTNINGD_ONCHAIN_HEADERS_NOGEN) LIGHTNINGD_ONCHAIN_HEADERS := $(LIGHTNINGD_ONCHAIN_HEADERS_GEN) $(LIGHTNINGD_ONCHAIN_HEADERS_NOGEN)
LIGHTNINGD_ONCHAIN_SRC := onchaind/onchain.c \ LIGHTNINGD_ONCHAIN_SRC := onchaind/onchaind.c \
onchaind/gen_onchain_wire.c \ onchaind/gen_onchain_wire.c \
onchaind/onchain_wire.c onchaind/onchain_wire.c

0
onchaind/onchain.c → onchaind/onchaind.c
View File

2
onchaind/test/run-grind_feerate.c
View File

@ -7,7 +7,7 @@
#define main unused_main #define main unused_main
int main(int argc, char *argv[]); int main(int argc, char *argv[]);
#include "../onchain.c" #include "../onchaind.c"
#undef main #undef main
/* AUTOGENERATED MOCKS START */ /* AUTOGENERATED MOCKS START */

2
openingd/Makefile
View File

@ -16,7 +16,7 @@ LIGHTNINGD_OPENING_HEADERS_NOGEN :=
LIGHTNINGD_OPENING_HEADERS := $(LIGHTNINGD_OPENING_HEADERS_GEN) $(LIGHTNINGD_OPENING_HEADERS_NOGEN) LIGHTNINGD_OPENING_HEADERS := $(LIGHTNINGD_OPENING_HEADERS_GEN) $(LIGHTNINGD_OPENING_HEADERS_NOGEN)
LIGHTNINGD_OPENING_SRC := openingd/opening.c \ LIGHTNINGD_OPENING_SRC := openingd/openingd.c \
$(LIGHTNINGD_OPENING_HEADERS:.h=.c) $(LIGHTNINGD_OPENING_HEADERS:.h=.c)
LIGHTNINGD_OPENING_OBJS := $(LIGHTNINGD_OPENING_SRC:.c=.o) LIGHTNINGD_OPENING_OBJS := $(LIGHTNINGD_OPENING_SRC:.c=.o)

0
openingd/opening.c → openingd/openingd.c
View File

Write Preview
Loading…
Cancel
Save