mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-03-12 10:30:29 +01:00
Makefiles: remove dependency on wire/onion_wiregen.o where unnecessary.
Also, WIRE_ONION_OBJS hasn't existed for a while. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
parent
4816550b0f
commit
ac40fdf414
12 changed files with 55 additions and 11 deletions
|
|
@ -104,6 +104,6 @@ CHANNELD_COMMON_OBJS := \
|
|||
channeld/full_channel_error_names_gen.h: channeld/full_channel_error.h ccan/ccan/cdump/tools/cdump-enumstr
|
||||
ccan/ccan/cdump/tools/cdump-enumstr channeld/full_channel_error.h > $@
|
||||
|
||||
lightningd/lightning_channeld: $(CHANNELD_OBJS) $(WIRE_ONION_OBJS) $(CHANNELD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
|
||||
lightningd/lightning_channeld: $(CHANNELD_OBJS) $(CHANNELD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
|
||||
|
||||
include channeld/test/Makefile
|
||||
|
|
|
|||
|
|
@ -62,6 +62,6 @@ CLOSINGD_COMMON_OBJS := \
|
|||
gossipd/gossip_store_wiregen.o \
|
||||
gossipd/gossipd_peerd_wiregen.o
|
||||
|
||||
lightningd/lightning_closingd: $(CLOSINGD_OBJS) $(WIRE_ONION_OBJS) $(CLOSINGD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
|
||||
lightningd/lightning_closingd: $(CLOSINGD_OBJS) $(CLOSINGD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
|
||||
|
||||
-include closingd/test/Makefile
|
||||
|
|
|
|||
|
|
@ -69,8 +69,7 @@ GOSSIPD_COMMON_OBJS := \
|
|||
common/version.o \
|
||||
common/wireaddr.o \
|
||||
common/wire_error.o \
|
||||
connectd/connectd_gossipd_wiregen.o \
|
||||
wire/onion_wiregen.o
|
||||
connectd/connectd_gossipd_wiregen.o
|
||||
|
||||
lightningd/lightning_gossipd: $(GOSSIPD_OBJS) $(GOSSIPD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)
|
||||
|
||||
|
|
|
|||
|
|
@ -161,6 +161,6 @@ lightningd/plugin.o: plugins/list_of_builtin_plugins_gen.h
|
|||
lightningd/channel_state_names_gen.h: lightningd/channel_state.h ccan/ccan/cdump/tools/cdump-enumstr
|
||||
ccan/ccan/cdump/tools/cdump-enumstr lightningd/channel_state.h > $@
|
||||
|
||||
lightningd/lightningd: $(LIGHTNINGD_OBJS) $(WALLET_OBJS) $(LIGHTNINGD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(WIRE_BOLT12_OBJS) $(WIRE_ONION_OBJS) $(LIGHTNINGD_CONTROL_OBJS) $(HSMD_CLIENT_OBJS) $(DB_OBJS)
|
||||
lightningd/lightningd: $(LIGHTNINGD_OBJS) $(WALLET_OBJS) $(LIGHTNINGD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(WIRE_BOLT12_OBJS) $(LIGHTNINGD_CONTROL_OBJS) $(HSMD_CLIENT_OBJS) $(DB_OBJS)
|
||||
|
||||
include lightningd/test/Makefile
|
||||
|
|
|
|||
|
|
@ -169,16 +169,13 @@ PLUGIN_COMMON_OBJS := \
|
|||
common/psbt_open.o \
|
||||
common/pseudorand.o \
|
||||
common/random_select.o \
|
||||
common/scb_wiregen.o \
|
||||
common/setup.o \
|
||||
common/status_levels.o \
|
||||
common/type_to_string.o \
|
||||
common/utils.o \
|
||||
common/version.o \
|
||||
common/wireaddr.o \
|
||||
wire/channel_type_wiregen.o \
|
||||
wire/fromwire.o \
|
||||
wire/onion_wiregen.o \
|
||||
wire/peer_wiregen.o \
|
||||
wire/tlvstream.o \
|
||||
wire/towire.o
|
||||
|
|
@ -194,11 +191,11 @@ ALL_PROGRAMS += $(C_PLUGINS)
|
|||
# Make all plugins depend on all plugin headers, for simplicity.
|
||||
$(PLUGIN_ALL_OBJS): $(PLUGIN_ALL_HEADER)
|
||||
|
||||
plugins/pay: $(PLUGIN_PAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12_wiregen.o bitcoin/block.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o
|
||||
plugins/pay: $(PLUGIN_PAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_PAY_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/gossmap.o common/fp16.o common/route.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12_wiregen.o bitcoin/block.o common/blindedpay.o common/blindedpath.o common/hmac.o common/blinding.o common/onion_encode.o common/gossmods_listpeerchannels.o wire/onion_wiregen.o
|
||||
|
||||
plugins/autoclean: $(PLUGIN_AUTOCLEAN_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)
|
||||
|
||||
plugins/chanbackup: $(PLUGIN_chanbackup_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)
|
||||
plugins/chanbackup: $(PLUGIN_chanbackup_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) common/scb_wiregen.o wire/channel_type_wiregen.o
|
||||
|
||||
plugins/commando: $(PLUGIN_COMMANDO_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS)
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@ ALL_C_HEADERS += $(PLUGIN_RENEPAY_HDRS)
|
|||
# Make all plugins depend on all plugin headers, for simplicity.
|
||||
$(PLUGIN_RENEPAY_OBJS): $(PLUGIN_RENEPAY_HDRS)
|
||||
|
||||
plugins/cln-renepay: $(PLUGIN_RENEPAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/gossmods_listpeerchannels.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12$(EXP)_wiregen.o
|
||||
plugins/cln-renepay: $(PLUGIN_RENEPAY_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) bitcoin/chainparams.o common/gossmap.o common/gossmods_listpeerchannels.o common/fp16.o common/dijkstra.o common/bolt12.o common/bolt12_merkle.o wire/bolt12$(EXP)_wiregen.o wire/onion_wiregen.o
|
||||
|
||||
include plugins/renepay/test/Makefile
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#include <common/utils.h>
|
||||
#include <common/node_id.h>
|
||||
#include <ccan/read_write_all/read_write_all.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
|
||||
#include "../mcf.c"
|
||||
|
||||
|
|
@ -26,12 +27,18 @@ double flowset_probability(const tal_t *ctx UNNEEDED, struct flow **flows UNNEED
|
|||
const struct gossmap *const gossmap UNNEEDED,
|
||||
struct chan_extra_map *chan_extra_map UNNEEDED, char **fail UNNEEDED)
|
||||
{ fprintf(stderr, "flowset_probability called!\n"); abort(); }
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for get_chan_extra_half_by_chan */
|
||||
struct chan_extra_half *get_chan_extra_half_by_chan(const struct gossmap *gossmap UNNEEDED,
|
||||
struct chan_extra_map *chan_extra_map UNNEEDED,
|
||||
const struct gossmap_chan *chan UNNEEDED,
|
||||
int dir UNNEEDED)
|
||||
{ fprintf(stderr, "get_chan_extra_half_by_chan called!\n"); abort(); }
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* AUTOGENERATED MOCKS END */
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
|
|
|||
|
|
@ -6,9 +6,19 @@
|
|||
#include <common/channel_id.h>
|
||||
#include <common/setup.h>
|
||||
#include <common/utils.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
|
||||
#include <plugins/renepay/dijkstra.h>
|
||||
|
||||
/* AUTOGENERATED MOCKS START */
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* AUTOGENERATED MOCKS END */
|
||||
|
||||
static void insertion_in_increasing_distance(const tal_t *ctx)
|
||||
{
|
||||
struct dijkstra *dijkstra = dijkstra_new(ctx,10);
|
||||
|
|
|
|||
|
|
@ -16,10 +16,17 @@
|
|||
#include <common/type_to_string.h>
|
||||
#include <common/wireaddr.h>
|
||||
#include <stdio.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
|
||||
/* AUTOGENERATED MOCKS START */
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for pay_plugin */
|
||||
struct pay_plugin *pay_plugin;
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for try_paying */
|
||||
const char *try_paying(const tal_t *ctx UNNEEDED,
|
||||
struct payment *payment UNNEEDED,
|
||||
|
|
|
|||
|
|
@ -16,10 +16,17 @@
|
|||
#include <common/wireaddr.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
|
||||
/* AUTOGENERATED MOCKS START */
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for pay_plugin */
|
||||
struct pay_plugin *pay_plugin;
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for try_paying */
|
||||
const char *try_paying(const tal_t *ctx UNNEEDED,
|
||||
struct payment *payment UNNEEDED,
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
#include <common/setup.h>
|
||||
#include <common/type_to_string.h>
|
||||
#include <common/wireaddr.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
|
||||
|
|
@ -20,6 +21,15 @@
|
|||
#define RENEPAY_UNITTEST
|
||||
#include <plugins/renepay/pay_flow.h>
|
||||
|
||||
/* AUTOGENERATED MOCKS START */
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* AUTOGENERATED MOCKS END */
|
||||
|
||||
static void destroy_payflow(
|
||||
struct pay_flow *p,
|
||||
struct payflow_map * map)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
#include <common/utils.h>
|
||||
#include <common/node_id.h>
|
||||
#include <ccan/read_write_all/read_write_all.h>
|
||||
#include <wire/onion_wiregen.h>
|
||||
|
||||
#define MYLOG "/tmp/debug.txt"
|
||||
#define RENEPAY_UNITTEST // logs are written in MYLOG
|
||||
|
|
@ -17,8 +18,14 @@
|
|||
#include "../mcf.c"
|
||||
|
||||
/* AUTOGENERATED MOCKS START */
|
||||
/* Generated stub for fromwire_blinded_path */
|
||||
struct blinded_path *fromwire_blinded_path(const tal_t *ctx UNNEEDED, const u8 **cursor UNNEEDED, size_t *plen UNNEEDED)
|
||||
{ fprintf(stderr, "fromwire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for pay_plugin */
|
||||
struct pay_plugin *pay_plugin;
|
||||
/* Generated stub for towire_blinded_path */
|
||||
void towire_blinded_path(u8 **p UNNEEDED, const struct blinded_path *blinded_path UNNEEDED)
|
||||
{ fprintf(stderr, "towire_blinded_path called!\n"); abort(); }
|
||||
/* Generated stub for try_paying */
|
||||
const char *try_paying(const tal_t *ctx UNNEEDED,
|
||||
struct payment *payment UNNEEDED,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue