aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-08 00:24:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: don't generate experimental variants of wire files.

Browse Source 
We no longer have any experimental-only wire definitions.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2023-05-22 10:21:44 +09:30
parent 45ef16892b
commit 4deb552fe9
19 changed files with 59 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/bolt12.h
View File

@@ -1,11 +1,7 @@
#ifndef LIGHTNING_COMMON_BOLT12_H
#define LIGHTNING_COMMON_BOLT12_H
#include "config.h"
#if EXPERIMENTAL_FEATURES
#include <wire/bolt12_exp_wiregen.h>
#else
#include <wire/bolt12_wiregen.h>
#endif
struct feature_set;

24
common/test/Makefile
View File

@@ -19,10 +19,10 @@ ALL_C_SOURCES += $(COMMON_TEST_SRC)
ALL_TEST_PROGRAMS += $(COMMON_TEST_PROGRAMS)
# Sphinx test wants to decode TLVs.
common/test/run-sphinx: wire/onion$(EXP)_wiregen.o wire/towire.o wire/fromwire.o
common/test/run-blindedpath_enctlv common/test/run-blindedpath_onion: common/base32.o common/wireaddr.o wire/onion$(EXP)_wiregen.o wire/peer$(EXP)_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o
common/test/run-route_blinding_test: wire/onion$(EXP)_wiregen.o wire/peer$(EXP)_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o common/coin_mvt.o
common/test/run-route_blinding_override_test: common/base32.o common/wireaddr.o wire/onion$(EXP)_wiregen.o wire/peer$(EXP)_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o common/coin_mvt.o
common/test/run-sphinx: wire/onion_wiregen.o wire/towire.o wire/fromwire.o
common/test/run-blindedpath_enctlv common/test/run-blindedpath_onion: common/base32.o common/wireaddr.o wire/onion_wiregen.o wire/peer_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o
common/test/run-route_blinding_test: wire/onion_wiregen.o wire/peer_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o common/coin_mvt.o
common/test/run-route_blinding_override_test: common/base32.o common/wireaddr.o wire/onion_wiregen.o wire/peer_wiregen.o wire/towire.o wire/fromwire.o wire/tlvstream.o common/coin_mvt.o
common/test/run-param \
common/test/run-json: \
@@ -38,27 +38,27 @@ common/test/run-json: \
common/type_to_string.o \
common/wireaddr.o \
wire/fromwire.o \
wire/onion$(EXP)_wiregen.o \
wire/peer$(EXP)_wiregen.o \
wire/onion_wiregen.o \
wire/peer_wiregen.o \
wire/towire.o
common/test/run-route common/test/run-route-specific: \
common/amount.o \
common/dijkstra.o \
common/fp16.o \
common/fp16.o \
common/gossmap.o \
common/node_id.o \
common/pseudorand.o \
common/route.o \
wire/fromwire.o \
wire/peer$(EXP)_wiregen.o \
wire/peer_wiregen.o \
wire/towire.o
common/test/run-gossmap_local: \
common/base32.o \
common/wireaddr.o \
wire/fromwire.o \
wire/peer$(EXP)_wiregen.o \
wire/peer_wiregen.o \
wire/tlvstream.o \
wire/towire.o
@@ -66,7 +66,7 @@ common/test/run-gossmap_canned: \
common/base32.o \
common/wireaddr.o \
wire/fromwire.o \
wire/peer$(EXP)_wiregen.o \
wire/peer_wiregen.o \
wire/tlvstream.o \
wire/towire.o
@@ -80,10 +80,10 @@ common/test/run-bolt12_merkle: \
common/node_id.o \
common/type_to_string.o \
common/wireaddr.o \
wire/bolt12$(EXP)_wiregen.o \
wire/bolt12_wiregen.o \
wire/fromwire.o \
wire/tlvstream.o \
wire/peer$(EXP)_wiregen.o \
wire/peer_wiregen.o \
wire/towire.o
common/test/run-bolt12_merkle-json: \

9
common/test/run-bolt12_merkle-json.c
View File

@@ -4,15 +4,10 @@
#include "../bolt12_merkle.c"
#include "../json_parse.c"
#include "../json_parse_simple.c"
#include "../../wire/bolt12_wiregen.c"
#include "../../wire/fromwire.c"
#include "../../wire/peer_wiregen.c"
#include "../../wire/tlvstream.c"
#if EXPERIMENTAL_FEATURES
#include "../../wire/peer_exp_wiregen.c"
#include "../../wire/bolt12_exp_wiregen.c"
#else
#include "../../wire/peer_wiregen.c"
#include "../../wire/bolt12_wiregen.c"
#endif
#include <ccan/tal/grab_file/grab_file.h>
#include <ccan/tal/path/path.h>
#include <common/channel_type.h>

9
common/test/run-onion-message-test.c
View File

@@ -16,13 +16,8 @@ static void maybe_print(const char *fmt, ...);
#include "../onion_message_parse.c"
#include "../sphinx.c"
#include "../type_to_string.c"
#if EXPERIMENTAL_FEATURES
#include "../../wire/onion_exp_wiregen.c"
#include "../../wire/peer_exp_wiregen.c"
#else
#include "../../wire/onion_wiregen.c"
#include "../../wire/peer_wiregen.c"
#endif
#include "../../wire/onion_wiregen.c"
#include "../../wire/peer_wiregen.c"
#include <common/ecdh.h>
#include <common/setup.h>
#include <stdio.h>

4
common/test/run-onion-test-vector.c
View File

@@ -8,11 +8,7 @@
#include "../type_to_string.c"
#include "../../wire/towire.c"
#include "../../wire/fromwire.c"
#if EXPERIMENTAL_FEATURES
#include "../../wire/onion_exp_wiregen.c"
#else
#include "../../wire/onion_wiregen.c"
#endif
#include <ccan/tal/grab_file/grab_file.h>
#include <ccan/tal/path/path.h>
#include <common/channel_id.h>

6
common/test/run-route_blinding_onion_test.c
View File

@@ -14,11 +14,7 @@
#include "../onion_encode.c"
#include "../sphinx.c"
#include "../type_to_string.c"
#if EXPERIMENTAL_FEATURES
#include "../../wire/onion_exp_wiregen.c"
#else
#include "../../wire/onion_wiregen.c"
#endif
#include "../../wire/onion_wiregen.c"
#include <ccan/tal/grab_file/grab_file.h>
#include <ccan/tal/path/path.h>
#include <common/bolt12.h>