mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

common: remove type_to_string files altogther.

Browse source 
This means including <common/utils.h> where it was indirectly included.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-03-20 11:17:55 +10:30
parent 37d22f9141
commit e0e879c003
154 changed files with 44 additions and 326 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bitcoin/block.c
View file

@ -5,7 +5,7 @@
#include <bitcoin/tx.h> #include <bitcoin/tx.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/type_to_string.h> #include <common/utils.h>
/* Sets *cursor to NULL and returns NULL when a pull fails. */ /* Sets *cursor to NULL and returns NULL when a pull fails. */
static const u8 *pull(const u8 **cursor, size_t *max, void *copy, size_t n) static const u8 *pull(const u8 **cursor, size_t *max, void *copy, size_t n)
@ -245,7 +245,6 @@ char *fmt_bitcoin_blkid(const tal_t *ctx,
bitcoin_blkid_to_hex(blkid, hexstr, hex_str_size(sizeof(*blkid))); bitcoin_blkid_to_hex(blkid, hexstr, hex_str_size(sizeof(*blkid)));
return hexstr; return hexstr;
} }
REGISTER_TYPE_TO_STRING(bitcoin_blkid, fmt_bitcoin_blkid);
void fromwire_bitcoin_blkid(const u8 **cursor, size_t *max, void fromwire_bitcoin_blkid(const u8 **cursor, size_t *max,
struct bitcoin_blkid *blkid) struct bitcoin_blkid *blkid)

1
bitcoin/locktime.c
View file

@ -2,7 +2,6 @@
#include <assert.h> #include <assert.h>
#include <bitcoin/locktime.h> #include <bitcoin/locktime.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h>
#define SECONDS_POINT 500000000 #define SECONDS_POINT 500000000

3
bitcoin/preimage.c
View file

@ -1,6 +1,5 @@
#include "config.h" #include "config.h"
#include <bitcoin/preimage.h> #include <bitcoin/preimage.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -18,5 +17,3 @@ char *fmt_preimage(const tal_t *ctx, const struct preimage *preimage)
{ {
return tal_hexstr(ctx, preimage, sizeof(*preimage)); return tal_hexstr(ctx, preimage, sizeof(*preimage));
} }
REGISTER_TYPE_TO_STRING(preimage, fmt_preimage);

4
bitcoin/privkey.c
View file

@ -1,7 +1,7 @@
#include "config.h" #include "config.h"
#include <bitcoin/privkey.h> #include <bitcoin/privkey.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
char *fmt_privkey(const tal_t *ctx, const struct privkey *secret) char *fmt_privkey(const tal_t *ctx, const struct privkey *secret)
@ -12,13 +12,11 @@ char *fmt_privkey(const tal_t *ctx, const struct privkey *secret)
strcat(str, "01"); strcat(str, "01");
return str; return str;
} }
REGISTER_TYPE_TO_STRING(privkey, fmt_privkey);
char *fmt_secret(const tal_t *ctx, const struct secret *secret) char *fmt_secret(const tal_t *ctx, const struct secret *secret)
{ {
return tal_hexstr(ctx, secret, sizeof(*secret)); return tal_hexstr(ctx, secret, sizeof(*secret));
} }
REGISTER_TYPE_TO_STRING(secret, fmt_secret);
bool secret_eq_consttime(const struct secret *a, const struct secret *b) bool secret_eq_consttime(const struct secret *a, const struct secret *b)
{ {

3
bitcoin/psbt.c
View file

@ -8,7 +8,7 @@
#include <ccan/ccan/array_size/array_size.h> #include <ccan/ccan/array_size/array_size.h>
#include <ccan/ccan/mem/mem.h> #include <ccan/ccan/mem/mem.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wally_psbt.h> #include <wally_psbt.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -745,7 +745,6 @@ char *fmt_wally_psbt(const tal_t *ctx, const struct wally_psbt *psbt)
return serialized_psbt; return serialized_psbt;
} }
REGISTER_TYPE_TO_STRING(wally_psbt, fmt_wally_psbt);
const u8 *psbt_get_bytes(const tal_t *ctx, const struct wally_psbt *psbt, const u8 *psbt_get_bytes(const tal_t *ctx, const struct wally_psbt *psbt,
size_t *bytes_written) size_t *bytes_written)

4
bitcoin/pubkey.c
View file

@ -4,7 +4,7 @@
#include <bitcoin/pubkey.h> #include <bitcoin/pubkey.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
#ifndef SUPERVERBOSE #ifndef SUPERVERBOSE
@ -69,7 +69,6 @@ char *fmt_pubkey(const tal_t *ctx, const struct pubkey *key)
pubkey_to_der(der, key); pubkey_to_der(der, key);
return tal_hexstr(ctx, der, sizeof(der)); return tal_hexstr(ctx, der, sizeof(der));
} }
REGISTER_TYPE_TO_STRING(pubkey, fmt_pubkey);
char *fmt_secp256k1_pubkey(const tal_t *ctx, const secp256k1_pubkey *key) char *fmt_secp256k1_pubkey(const tal_t *ctx, const secp256k1_pubkey *key)
{ {
@ -81,7 +80,6 @@ char *fmt_secp256k1_pubkey(const tal_t *ctx, const secp256k1_pubkey *key)
assert(outlen == sizeof(der)); assert(outlen == sizeof(der));
return tal_hexstr(ctx, der, sizeof(der)); return tal_hexstr(ctx, der, sizeof(der));
} }
REGISTER_TYPE_TO_STRING(secp256k1_pubkey, fmt_secp256k1_pubkey);
int pubkey_cmp(const struct pubkey *a, const struct pubkey *b) int pubkey_cmp(const struct pubkey *a, const struct pubkey *b)
{ {

3
bitcoin/shadouble.c
View file

@ -1,7 +1,7 @@
#include "config.h" #include "config.h"
#include <bitcoin/shadouble.h> #include <bitcoin/shadouble.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
void sha256_double(struct sha256_double *shadouble, const void *p, size_t len) void sha256_double(struct sha256_double *shadouble, const void *p, size_t len)
@ -20,7 +20,6 @@ char *fmt_sha256_double(const tal_t *ctx, const struct sha256_double *shad)
{ {
return tal_hexstr(ctx, shad, sizeof(*shad)); return tal_hexstr(ctx, shad, sizeof(*shad));
} }
REGISTER_TYPE_TO_STRING(sha256_double, fmt_sha256_double);
void towire_sha256_double(u8 **pptr, const struct sha256_double *sha256d) void towire_sha256_double(u8 **pptr, const struct sha256_double *sha256d)
{ {

10
bitcoin/short_channel_id.c
View file

@ -1,7 +1,6 @@
#include "config.h" #include "config.h"
#include <bitcoin/short_channel_id.h> #include <bitcoin/short_channel_id.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h>
#include <stdio.h> #include <stdio.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -87,15 +86,6 @@ char *fmt_short_channel_id_dir(const tal_t *ctx,
return str; return str;
} }
static char *fmt_short_channel_id_ptr(const tal_t *ctx,
const struct short_channel_id *scid)
{
return fmt_short_channel_id(ctx, *scid);
}
REGISTER_TYPE_TO_STRING(short_channel_id, fmt_short_channel_id_ptr);
REGISTER_TYPE_TO_STRING(short_channel_id_dir, fmt_short_channel_id_dir);
void towire_short_channel_id(u8 **pptr, void towire_short_channel_id(u8 **pptr,
const struct short_channel_id *short_channel_id) const struct short_channel_id *short_channel_id)
{ {

6
bitcoin/signature.c
View file

@ -8,7 +8,7 @@
#include <bitcoin/signature.h> #include <bitcoin/signature.h>
#include <bitcoin/tx.h> #include <bitcoin/tx.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <secp256k1_schnorrsig.h> #include <secp256k1_schnorrsig.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -334,7 +334,6 @@ char *fmt_secp256k1_ecdsa_signature(const tal_t *ctx, const secp256k1_ecdsa_sign
return tal_hexstr(ctx, der, len); return tal_hexstr(ctx, der, len);
} }
REGISTER_TYPE_TO_STRING(secp256k1_ecdsa_signature, fmt_secp256k1_ecdsa_signature);
char *fmt_bitcoin_signature(const tal_t *ctx, char *fmt_bitcoin_signature(const tal_t *ctx,
const struct bitcoin_signature *sig) const struct bitcoin_signature *sig)
@ -344,7 +343,6 @@ char *fmt_bitcoin_signature(const tal_t *ctx,
return tal_hexstr(ctx, der, len); return tal_hexstr(ctx, der, len);
} }
REGISTER_TYPE_TO_STRING(bitcoin_signature, fmt_bitcoin_signature);
void fromwire_bitcoin_signature(const u8 **cursor, size_t *max, void fromwire_bitcoin_signature(const u8 **cursor, size_t *max,
struct bitcoin_signature *sig) struct bitcoin_signature *sig)
@ -378,8 +376,6 @@ char *fmt_bip340sig(const tal_t *ctx, const struct bip340sig *bip340sig)
return tal_hexstr(ctx, bip340sig->u8, sizeof(bip340sig->u8)); return tal_hexstr(ctx, bip340sig->u8, sizeof(bip340sig->u8));
} }
REGISTER_TYPE_TO_STRING(bip340sig, fmt_bip340sig);
/* BIP-340: /* BIP-340:
* *
* This proposal suggests to include the tag by prefixing the hashed * This proposal suggests to include the tag by prefixing the hashed

15
bitcoin/tx.c
View file

@ -6,7 +6,7 @@
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wally_psbt.h> #include <wally_psbt.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -754,10 +754,15 @@ char *fmt_wally_tx(const tal_t *ctx, const struct wally_tx *tx)
return s; return s;
} }
REGISTER_TYPE_TO_STRING(bitcoin_tx, fmt_bitcoin_tx); char *fmt_sha256(const tal_t *ctx, const struct sha256 *sha256)
REGISTER_TYPE_TO_STRING(bitcoin_txid, fmt_bitcoin_txid); {
REGISTER_TYPE_TO_STRING(bitcoin_outpoint, fmt_bitcoin_outpoint); return tal_hexstr(ctx, sha256, sizeof(*sha256));
REGISTER_TYPE_TO_STRING(wally_tx, fmt_wally_tx); }
char *fmt_ripemd160(const tal_t *ctx, const struct ripemd160 *ripemd160)
{
return tal_hexstr(ctx, ripemd160, sizeof(*ripemd160));
}
void fromwire_bitcoin_txid(const u8 **cursor, size_t *max, void fromwire_bitcoin_txid(const u8 **cursor, size_t *max,
struct bitcoin_txid *txid) struct bitcoin_txid *txid)

5
bitcoin/tx.h
View file

@ -14,7 +14,9 @@
/* BIP 125: Any nsequence < 0xFFFFFFFE is replacable. /* BIP 125: Any nsequence < 0xFFFFFFFE is replacable.
* And bitcoind uses this value. */ * And bitcoind uses this value. */
#define BITCOIN_TX_RBF_SEQUENCE 0xFFFFFFFD #define BITCOIN_TX_RBF_SEQUENCE 0xFFFFFFFD
struct wally_psbt; struct wally_psbt;
struct ripemd160;
struct bitcoin_txid { struct bitcoin_txid {
struct sha256_double shad; struct sha256_double shad;
@ -290,6 +292,9 @@ char *fmt_bitcoin_outpoint(const tal_t *ctx,
const struct bitcoin_outpoint *outpoint); const struct bitcoin_outpoint *outpoint);
char *fmt_wally_tx(const tal_t *ctx, const struct wally_tx *tx); char *fmt_wally_tx(const tal_t *ctx, const struct wally_tx *tx);
/* For want of somewhere better to define them! */
char *fmt_sha256(const tal_t *ctx, const struct sha256 *sha256);
char *fmt_ripemd160(const tal_t *ctx, const struct ripemd160 *ripemd160);
/* Various weights of transaction parts. */ /* Various weights of transaction parts. */
size_t bitcoin_tx_core_weight(size_t num_inputs, size_t num_outputs); size_t bitcoin_tx_core_weight(size_t num_inputs, size_t num_outputs);

1
channeld/Makefile
View file

@ -90,7 +90,6 @@ CHANNELD_COMMON_OBJS := \
common/status_wire.o \ common/status_wire.o \
common/subdaemon.o \ common/subdaemon.o \
common/timeout.o \ common/timeout.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
channeld/channeld.c
View file

@ -42,7 +42,6 @@
#include <common/status.h> #include <common/status.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

1
channeld/full_channel.c
View file

@ -13,7 +13,6 @@
#include <common/keyset.h> #include <common/keyset.h>
#include <common/memleak.h> #include <common/memleak.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <stdio.h> #include <stdio.h>
/* Needs to be at end, since it doesn't include its own hdrs */ /* Needs to be at end, since it doesn't include its own hdrs */
#include "full_channel_error_names_gen.h" #include "full_channel_error_names_gen.h"

1
channeld/test/Makefile
View file

@ -22,7 +22,6 @@ CHANNELD_TEST_COMMON_OBJS := \
common/permute_tx.o \ common/permute_tx.o \
common/pseudorand.o \ common/pseudorand.o \
common/setup.o \ common/setup.o \
common/type_to_string.o \
common/utils.o common/utils.o
$(CHANNELD_TEST_PROGRAMS): $(BITCOIN_OBJS) $(WIRE_OBJS) $(CHANNELD_TEST_COMMON_OBJS) $(CHANNELD_TEST_PROGRAMS): $(BITCOIN_OBJS) $(WIRE_OBJS) $(CHANNELD_TEST_COMMON_OBJS)

3
channeld/test/run-commit_tx.c
View file

@ -1,7 +1,8 @@
#include "config.h" #include "config.h"
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <common/type_to_string.h> #include <stdbool.h>
static bool print_superverbose; static bool print_superverbose;
#define SUPERVERBOSE(...) \ #define SUPERVERBOSE(...) \
do { if (print_superverbose) printf(__VA_ARGS__); } while(0) do { if (print_superverbose) printf(__VA_ARGS__); } while(0)

1
channeld/watchtower.c
View file

@ -8,7 +8,6 @@
#include <common/keyset.h> #include <common/keyset.h>
#include <common/psbt_keypath.h> #include <common/psbt_keypath.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>
#include <wire/wire_sync.h> #include <wire/wire_sync.h>

1
cli/test/Makefile
View file

@ -20,7 +20,6 @@ CLI_TEST_COMMON_OBJS := \
common/setup.o \ common/setup.o \
common/utils.o \ common/utils.o \
common/version.o \ common/version.o \
common/type_to_string.o \
common/permute_tx.o common/permute_tx.o
$(CLI_TEST_PROGRAMS): libccan.a $(BITCOIN_OBJS) $(WIRE_OBJS) $(CLI_TEST_COMMON_OBJS) $(CLI_TEST_PROGRAMS): libccan.a $(BITCOIN_OBJS) $(WIRE_OBJS) $(CLI_TEST_COMMON_OBJS)

1
closingd/Makefile
View file

@ -53,7 +53,6 @@ CLOSINGD_COMMON_OBJS := \
common/status.o \ common/status.o \
common/status_wire.o \ common/status_wire.o \
common/subdaemon.o \ common/subdaemon.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
closingd/closingd.c
View file

@ -16,7 +16,6 @@
#include <common/read_peer_msg.h> #include <common/read_peer_msg.h>
#include <common/status.h> #include <common/status.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <common/version.h> #include <common/version.h>
#include <common/wire_error.h> #include <common/wire_error.h>

1
common/Makefile
View file

@ -94,7 +94,6 @@ COMMON_SRC_NOGEN := \
common/timeout.c \ common/timeout.c \
common/trace.c \ common/trace.c \
common/tx_roles.c \ common/tx_roles.c \
common/type_to_string.c \
common/utils.c \ common/utils.c \
common/utxo.c \ common/utxo.c \
common/version.c \ common/version.c \

16
common/amount.c
View file

@ -5,7 +5,7 @@
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/amount.h> #include <common/amount.h>
#include <common/overflows.h> #include <common/overflows.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <inttypes.h> #include <inttypes.h>
#include <wire/wire.h> #include <wire/wire.h>
@ -64,13 +64,6 @@ char *fmt_amount_msat(const tal_t *ctx, struct amount_msat msat)
return tal_fmt(ctx, "%"PRIu64"msat", msat.millisatoshis); return tal_fmt(ctx, "%"PRIu64"msat", msat.millisatoshis);
} }
static const char *fmt_amount_msat_ptr(const tal_t *ctx,
const struct amount_msat *msat)
{
return fmt_amount_msat(ctx, *msat);
}
REGISTER_TYPE_TO_STRING(amount_msat, fmt_amount_msat_ptr);
const char *fmt_amount_sat_btc(const tal_t *ctx, const char *fmt_amount_sat_btc(const tal_t *ctx,
struct amount_sat sat, struct amount_sat sat,
bool append_unit) bool append_unit)
@ -89,13 +82,6 @@ char *fmt_amount_sat(const tal_t *ctx, struct amount_sat sat)
return tal_fmt(ctx, "%"PRIu64"sat", sat.satoshis); return tal_fmt(ctx, "%"PRIu64"sat", sat.satoshis);
} }
static const char *fmt_amount_sat_ptr(const tal_t *ctx,
const struct amount_sat *sat)
{
return fmt_amount_sat(ctx, *sat);
}
REGISTER_TYPE_TO_STRING(amount_sat, fmt_amount_sat_ptr);
static bool breakup(const char *str, size_t slen, static bool breakup(const char *str, size_t slen,
/* Length of first numeric part. */ /* Length of first numeric part. */
size_t *whole_number_len, size_t *whole_number_len,

1
common/blindedpath.c
View file

@ -1,4 +1,5 @@
#include "config.h" #include "config.h"
#include <bitcoin/tx.h>
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
#include <common/blindedpath.h> #include <common/blindedpath.h>
#include <common/blinding.h> #include <common/blinding.h>

2
common/blockheight_states.c
View file

@ -4,7 +4,6 @@
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/blockheight_states.h> #include <common/blockheight_states.h>
#include <common/fee_states.h> #include <common/fee_states.h>
#include <common/type_to_string.h>
#include <wire/wire.h> #include <wire/wire.h>
struct height_states *new_height_states(const tal_t *ctx, struct height_states *new_height_states(const tal_t *ctx,
@ -160,4 +159,3 @@ char *fmt_height_states(const tal_t *ctx,
tal_append_fmt(&ret, " }"); tal_append_fmt(&ret, " }");
return ret; return ret;
} }
REGISTER_TYPE_TO_STRING(height_states, fmt_height_states);

1
common/bolt12_merkle.c
View file

@ -1,5 +1,6 @@
#include "config.h" #include "config.h"
#include <assert.h> #include <assert.h>
#include <bitcoin/tx.h>
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
#include <ccan/ilog/ilog.h> #include <ccan/ilog/ilog.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>

4
common/channel_id.c
View file

@ -3,7 +3,7 @@
#include <bitcoin/tx.h> #include <bitcoin/tx.h>
#include <common/channel_id.h> #include <common/channel_id.h>
#include <common/pseudorand.h> #include <common/pseudorand.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
void derive_channel_id(struct channel_id *channel_id, void derive_channel_id(struct channel_id *channel_id,
@ -98,5 +98,3 @@ char *fmt_channel_id(const tal_t *ctx, const struct channel_id *channel_id)
{ {
return tal_hexstr(ctx, channel_id, sizeof(*channel_id)); return tal_hexstr(ctx, channel_id, sizeof(*channel_id));
} }
REGISTER_TYPE_TO_STRING(channel_id, fmt_channel_id);

1
common/coin_mvt.c
View file

@ -5,7 +5,6 @@
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/coin_mvt.h> #include <common/coin_mvt.h>
#include <common/node_id.h> #include <common/node_id.h>
#include <common/type_to_string.h>
#include <wire/wire.h> #include <wire/wire.h>
#define EXTERNAL "external" #define EXTERNAL "external"

2
common/fee_states.c
View file

@ -3,7 +3,6 @@
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/fee_states.h> #include <common/fee_states.h>
#include <common/type_to_string.h>
#include <wire/wire.h> #include <wire/wire.h>
/* If we're the finder, it's like an HTLC we added, if they are, it's like /* If we're the finder, it's like an HTLC we added, if they are, it's like
@ -170,4 +169,3 @@ char *fmt_fee_states(const tal_t *ctx,
tal_append_fmt(&ret, " }"); tal_append_fmt(&ret, " }");
return ret; return ret;
} }
REGISTER_TYPE_TO_STRING(fee_states, fmt_fee_states);

1
common/gossmap.c
View file

@ -9,7 +9,6 @@
#include <common/gossip_store.h> #include <common/gossip_store.h>
#include <common/gossmap.h> #include <common/gossmap.h>
#include <common/pseudorand.h> #include <common/pseudorand.h>
#include <common/type_to_string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <gossipd/gossip_store_wiregen.h> #include <gossipd/gossip_store_wiregen.h>

3
common/initial_channel.c
View file

@ -8,7 +8,6 @@
#include <common/initial_channel.h> #include <common/initial_channel.h>
#include <common/initial_commit_tx.h> #include <common/initial_commit_tx.h>
#include <common/keyset.h> #include <common/keyset.h>
#include <common/type_to_string.h>
struct channel *new_initial_channel(const tal_t *ctx, struct channel *new_initial_channel(const tal_t *ctx,
const struct channel_id *cid, const struct channel_id *cid,
@ -247,5 +246,3 @@ char *fmt_channel(const tal_t *ctx, const struct channel *channel)
fmt_channel_view(ctx, &channel->view[LOCAL]), fmt_channel_view(ctx, &channel->view[LOCAL]),
fmt_channel_view(ctx, &channel->view[REMOTE])); fmt_channel_view(ctx, &channel->view[REMOTE]));
} }
/* Magic comment. */
REGISTER_TYPE_TO_STRING(channel, fmt_channel);

1
common/initial_commit_tx.c
View file

@ -5,7 +5,6 @@
#include <common/keyset.h> #include <common/keyset.h>
#include <common/permute_tx.h> #include <common/permute_tx.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
/* BOLT #3: /* BOLT #3:
* *

1
common/interactivetx.c
View file

@ -21,7 +21,6 @@
#include <common/setup.h> #include <common/setup.h>
#include <common/status.h> #include <common/status.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
/* /*

1
common/json_stream.c
View file

@ -20,7 +20,6 @@
#include <common/json_parse.h> #include <common/json_parse.h>
#include <common/json_stream.h> #include <common/json_stream.h>
#include <common/node_id.h> #include <common/node_id.h>
#include <common/type_to_string.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

3
common/node_id.c
View file

@ -5,7 +5,7 @@
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/node_id.h> #include <common/node_id.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <wire/wire.h> #include <wire/wire.h>
/* Convert from pubkey to compressed pubkey. */ /* Convert from pubkey to compressed pubkey. */
@ -38,7 +38,6 @@ char *fmt_node_id(const tal_t *ctx, const struct node_id *id)
{ {
return tal_hexstr(ctx, id->k, sizeof(id->k)); return tal_hexstr(ctx, id->k, sizeof(id->k));
} }
REGISTER_TYPE_TO_STRING(node_id, fmt_node_id);
/* Convert from hex string of SEC1 encoding */ /* Convert from hex string of SEC1 encoding */
bool node_id_from_hexstr(const char *str, size_t slen, struct node_id *id) bool node_id_from_hexstr(const char *str, size_t slen, struct node_id *id)

1
common/onion_message_parse.c
View file

@ -6,7 +6,6 @@
#include <common/onion_message_parse.h> #include <common/onion_message_parse.h>
#include <common/sphinx.h> #include <common/sphinx.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <wire/onion_wire.h> #include <wire/onion_wire.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>

2
common/test/Makefile
View file

@ -31,7 +31,6 @@ common/test/run-json: \
common/lease_rates.o \ common/lease_rates.o \
common/node_id.o \ common/node_id.o \
common/pseudorand.o \ common/pseudorand.o \
common/type_to_string.o \
common/wireaddr.o \ common/wireaddr.o \
wire/fromwire.o \ wire/fromwire.o \
wire/onion_wiregen.o \ wire/onion_wiregen.o \
@ -74,7 +73,6 @@ common/test/run-bolt12_merkle: \
common/bech32_util.o \ common/bech32_util.o \
common/bolt12.o \ common/bolt12.o \
common/node_id.o \ common/node_id.o \
common/type_to_string.o \
common/wireaddr.o \ common/wireaddr.o \
wire/bolt12_wiregen.o \ wire/bolt12_wiregen.o \
wire/fromwire.o \ wire/fromwire.o \

1
common/test/run-blindedpath_enctlv.c
View file

@ -2,7 +2,6 @@
#include "../bigsize.c" #include "../bigsize.c"
#include "../blinding.c" #include "../blinding.c"
#include "../hmac.c" #include "../hmac.c"
#include "../type_to_string.c"
#include <common/channel_id.h> #include <common/channel_id.h>
#include <common/setup.h> #include <common/setup.h>
#include <stdio.h> #include <stdio.h>

1
common/test/run-blindedpath_onion.c
View file

@ -7,7 +7,6 @@
#include "../onion_decode.c" #include "../onion_decode.c"
#include "../onion_encode.c" #include "../onion_encode.c"
#include "../sphinx.c" #include "../sphinx.c"
#include "../type_to_string.c"
#include <common/setup.h> #include <common/setup.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>
#include <stdio.h> #include <stdio.h>

1
common/test/run-bolt12_merkle.c
View file

@ -1,7 +1,6 @@
#define SUPERVERBOSE printf #define SUPERVERBOSE printf
#include "config.h" #include "config.h"
/* Needed before including bolt12_merkle.c: */ /* Needed before including bolt12_merkle.c: */
#include <common/type_to_string.h>
#include <stdio.h> #include <stdio.h>
#include "../bolt12_merkle.c" #include "../bolt12_merkle.c"
#include <assert.h> #include <assert.h>

1
common/test/run-gossmap-fp16.c
View file

@ -1,7 +1,6 @@
#include "config.h" #include "config.h"
#include "../fp16.c" #include "../fp16.c"
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <stdio.h> #include <stdio.h>
#include <wire/wire.h> #include <wire/wire.h>

2
common/test/run-key_derive.c
View file

@ -1,12 +1,12 @@
#define SUPERVERBOSE #define SUPERVERBOSE
#include "config.h" #include "config.h"
#include <assert.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <common/amount.h> #include <common/amount.h>
#include <common/setup.h> #include <common/setup.h>
#include <stdio.h> #include <stdio.h>
#include <wire/wire.h> #include <wire/wire.h>
#include "../type_to_string.c"
#include "../key_derive.c" #include "../key_derive.c"
/* AUTOGENERATED MOCKS START */ /* AUTOGENERATED MOCKS START */

1
common/test/run-onion-message-test.c
View file

@ -15,7 +15,6 @@ static void maybe_print(const char *fmt, ...);
#include "../onion_encode.c" #include "../onion_encode.c"
#include "../onion_message_parse.c" #include "../onion_message_parse.c"
#include "../sphinx.c" #include "../sphinx.c"
#include "../type_to_string.c"
#include "../../wire/onion_wiregen.c" #include "../../wire/onion_wiregen.c"
#include "../../wire/peer_wiregen.c" #include "../../wire/peer_wiregen.c"
#include <common/ecdh.h> #include <common/ecdh.h>

1
common/test/run-onion-test-vector.c
View file

@ -5,7 +5,6 @@
#include "../onion_decode.c" #include "../onion_decode.c"
#include "../sphinx.c" #include "../sphinx.c"
#include "../hmac.c" #include "../hmac.c"
#include "../type_to_string.c"
#include "../../wire/towire.c" #include "../../wire/towire.c"
#include "../../wire/fromwire.c" #include "../../wire/fromwire.c"
#include "../../wire/onion_wiregen.c" #include "../../wire/onion_wiregen.c"

1
common/test/run-route-infloop.c
View file

@ -9,7 +9,6 @@
#include <common/gossip_store.h> #include <common/gossip_store.h>
#include <common/route.h> #include <common/route.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>

1
common/test/run-route-specific.c
View file

@ -13,7 +13,6 @@
#include <common/gossip_store.h> #include <common/gossip_store.h>
#include <common/route.h> #include <common/route.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <bitcoin/chainparams.h> #include <bitcoin/chainparams.h>
#include <stdio.h> #include <stdio.h>

1
common/test/run-route.c
View file

@ -6,7 +6,6 @@
#include <common/gossip_store.h> #include <common/gossip_store.h>
#include <common/route.h> #include <common/route.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <bitcoin/chainparams.h> #include <bitcoin/chainparams.h>
#include <stdio.h> #include <stdio.h>

1
common/test/run-route_blinding_onion_test.c
View file

@ -13,7 +13,6 @@
#include "../json_parse_simple.c" #include "../json_parse_simple.c"
#include "../onion_encode.c" #include "../onion_encode.c"
#include "../sphinx.c" #include "../sphinx.c"
#include "../type_to_string.c"
#include "../../wire/onion_wiregen.c" #include "../../wire/onion_wiregen.c"
#include <ccan/tal/grab_file/grab_file.h> #include <ccan/tal/grab_file/grab_file.h>
#include <ccan/tal/path/path.h> #include <ccan/tal/path/path.h>

1
common/test/run-route_blinding_test.c
View file

@ -7,7 +7,6 @@
#include "../hmac.c" #include "../hmac.c"
#include "../json_parse.c" #include "../json_parse.c"
#include "../json_parse_simple.c" #include "../json_parse_simple.c"
#include "../type_to_string.c"
#include <ccan/tal/grab_file/grab_file.h> #include <ccan/tal/grab_file/grab_file.h>
#include <ccan/tal/path/path.h> #include <ccan/tal/path/path.h>
#include <common/channel_id.h> #include <common/channel_id.h>

49
common/type_to_string.c
View file

@ -1,49 +0,0 @@
#include "config.h"
#include <assert.h>
#include <bitcoin/preimage.h>
#include <ccan/tal/str/str.h>
#include <common/type_to_string.h>
char *fmt_sha256(const tal_t *ctx, const struct sha256 *sha256)
{
return tal_hexstr(ctx, sha256, sizeof(*sha256));
}
char *fmt_ripemd160(const tal_t *ctx, const struct ripemd160 *ripemd160)
{
return tal_hexstr(ctx, ripemd160, sizeof(*ripemd160));
}
/* We need at least one, and these are in CCAN so register it here. */
REGISTER_TYPE_TO_STRING(sha256, fmt_sha256);
REGISTER_TYPE_TO_STRING(ripemd160, fmt_ripemd160);
const char *type_to_string_(const tal_t *ctx, const char *typename,
union printable_types u)
{
const char *s = NULL;
size_t i;
static size_t num_p;
static struct type_to_string **t = NULL;
assert(typename != NULL);
if (!t)
t = autodata_get(type_to_string, &num_p);
/* Typenames in registrations don't include "struct " */
if (strstarts(typename, "struct "))
typename += strlen("struct ");
for (i = 0; i < num_p; i++) {
if (streq(t[i]->typename, typename)) {
s = t[i]->fmt(ctx, u);
break;
}
}
/* **BROKEN** makes CI upset, which is what we want! */
if (!s)
s = tal_fmt(ctx, "**BROKEN** UNKNOWN TYPE %s", typename);
return s;
}

70
common/type_to_string.h
View file

@ -1,70 +0,0 @@
#ifndef LIGHTNING_COMMON_TYPE_TO_STRING_H
#define LIGHTNING_COMMON_TYPE_TO_STRING_H
#include "config.h"
#include <common/autodata.h>
#include <common/utils.h>
/* This must match the type_to_string_ cases. */
union printable_types {
const struct pubkey *pubkey;
const struct node_id *node_id;
const struct bitcoin_txid *bitcoin_txid;
const struct bitcoin_blkid *bitcoin_blkid;
const struct bitcoin_outpoint *bitcoin_outpoint;
const struct sha256 *sha256;
const struct sha256_double *sha256_double;
const struct ripemd160 *ripemd160;
const struct bitcoin_tx *bitcoin_tx;
const struct htlc *htlc;
const struct preimage *preimage;
const struct channel_oneside *channel_oneside;
const struct wireaddr *wireaddr;
const struct wireaddr_internal *wireaddr_internal;
const secp256k1_pubkey *secp256k1_pubkey;
const struct channel_id *channel_id;
const struct short_channel_id *short_channel_id;
const struct short_channel_id_dir *short_channel_id_dir;
const struct secret *secret;
const struct privkey *privkey;
const secp256k1_ecdsa_signature *secp256k1_ecdsa_signature;
const struct bitcoin_signature *bitcoin_signature;
const struct bip340sig *bip340sig;
const struct channel *channel;
const struct amount_msat *amount_msat;
const struct amount_sat *amount_sat;
const struct fee_states *fee_states;
const struct height_states *height_states;
const char *charp_;
const struct wally_psbt *wally_psbt;
const struct wally_tx *wally_tx;
};
#define type_to_string(ctx, type, ptr) \
type_to_string_((ctx), stringify(type), \
((void)sizeof((ptr) == (type *)NULL), \
((union printable_types)((const type *)ptr))))
const char *type_to_string_(const tal_t *ctx, const char *typename,
union printable_types u);
#define REGISTER_TYPE_TO_STRING(typename, fmtfn) \
static const char *fmt_##typename##_(const tal_t *ctx, \
union printable_types u) \
{ \
return fmtfn(ctx, u.typename); \
} \
static struct type_to_string ttos_##typename = { \
#typename, fmt_##typename##_ \
}; \
AUTODATA(type_to_string, &ttos_##typename)
struct type_to_string {
const char *typename;
const char *(*fmt)(const tal_t *ctx, union printable_types u);
};
AUTODATA_TYPE(type_to_string, struct type_to_string);
char *fmt_sha256(const tal_t *ctx, const struct sha256 *sha256);
char *fmt_ripemd160(const tal_t *ctx, const struct ripemd160 *ripemd160);
#endif /* LIGHTNING_COMMON_TYPE_TO_STRING_H */

1
common/wire_error.c
View file

@ -1,7 +1,6 @@
#include "config.h" #include "config.h"
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>

4
common/wireaddr.c
View file

@ -5,7 +5,7 @@
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/base32.h> #include <common/base32.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <netdb.h> #include <netdb.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -243,7 +243,6 @@ char *fmt_wireaddr_internal(const tal_t *ctx,
} }
abort(); abort();
} }
REGISTER_TYPE_TO_STRING(wireaddr_internal, fmt_wireaddr_internal);
char *fmt_wireaddr_without_port(const tal_t * ctx, const struct wireaddr *a) char *fmt_wireaddr_without_port(const tal_t * ctx, const struct wireaddr *a)
{ {
@ -279,7 +278,6 @@ char *fmt_wireaddr(const tal_t *ctx, const struct wireaddr *a)
tal_append_fmt(&ret, ":%u", a->port); tal_append_fmt(&ret, ":%u", a->port);
return ret; return ret;
} }
REGISTER_TYPE_TO_STRING(wireaddr, fmt_wireaddr);
/* Valid forms: /* Valid forms:
* *

1
connectd/Makefile
View file

@ -74,7 +74,6 @@ CONNECTD_COMMON_OBJS := \
common/status_wire.o \ common/status_wire.o \
common/subdaemon.o \ common/subdaemon.o \
common/timeout.o \ common/timeout.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
connectd/connectd.c
View file

@ -28,7 +28,6 @@
#include <common/status.h> #include <common/status.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd.h> #include <connectd/connectd.h>
#include <connectd/connectd_gossipd_wiregen.h> #include <connectd/connectd_gossipd_wiregen.h>

1
connectd/handshake.c
View file

@ -8,7 +8,6 @@
#include <common/crypto_state.h> #include <common/crypto_state.h>
#include <common/ecdh.h> #include <common/ecdh.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <connectd/handshake.h> #include <connectd/handshake.h>

1
connectd/multiplex.c
View file

@ -15,7 +15,6 @@
#include <common/ping.h> #include <common/ping.h>
#include <common/status.h> #include <common/status.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd.h> #include <connectd/connectd.h>

1
connectd/onion_message.c
View file

@ -9,7 +9,6 @@
#include <common/onion_message_parse.h> #include <common/onion_message_parse.h>
#include <common/sphinx.h> #include <common/sphinx.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd.h> #include <connectd/connectd.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>

1
connectd/test/Makefile
View file

@ -9,7 +9,6 @@ CONNECTD_TEST_COMMON_OBJS := \
common/features.o \ common/features.o \
common/pseudorand.o \ common/pseudorand.o \
common/setup.o \ common/setup.o \
common/type_to_string.o \
common/utils.o common/utils.o
ALL_C_SOURCES += $(CONNECTD_TEST_SRC) ALL_C_SOURCES += $(CONNECTD_TEST_SRC)

1
devtools/Makefile
View file

@ -38,7 +38,6 @@ DEVTOOLS_COMMON_OBJS := \
common/psbt_open.o \ common/psbt_open.o \
common/pseudorand.o \ common/pseudorand.o \
common/setup.o \ common/setup.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/version.o \ common/version.o \
common/wireaddr.o \ common/wireaddr.o \

1
devtools/bolt11-cli.c
View file

@ -11,7 +11,6 @@
#include <common/bolt11.h> #include <common/bolt11.h>
#include <common/features.h> #include <common/features.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <common/version.h> #include <common/version.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

2
devtools/bolt12-cli.c
View file

@ -1,5 +1,6 @@
#include "config.h" #include "config.h"
#include <bitcoin/chainparams.h> #include <bitcoin/chainparams.h>
#include <bitcoin/tx.h>
#include <ccan/array_size/array_size.h> #include <ccan/array_size/array_size.h>
#include <ccan/err/err.h> #include <ccan/err/err.h>
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
@ -10,7 +11,6 @@
#include <common/features.h> #include <common/features.h>
#include <common/iso4217.h> #include <common/iso4217.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <common/version.h> #include <common/version.h>
#include <inttypes.h> #include <inttypes.h>
#include <secp256k1_schnorrsig.h> #include <secp256k1_schnorrsig.h>

1
devtools/dump-gossipstore.c
View file

@ -3,7 +3,6 @@
#include <ccan/err/err.h> #include <ccan/err/err.h>
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
#include <common/gossip_store.h> #include <common/gossip_store.h>
#include <common/type_to_string.h>
#include <fcntl.h> #include <fcntl.h>
#include <gossipd/gossip_store_wiregen.h> #include <gossipd/gossip_store_wiregen.h>
#include <stdio.h> #include <stdio.h>

1
devtools/fp16.c
View file

@ -4,7 +4,6 @@
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
#include <common/fp16.h> #include <common/fp16.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

1
devtools/mkclose.c
View file

@ -11,7 +11,6 @@
#include <common/htlc_wire.h> #include <common/htlc_wire.h>
#include <common/initial_commit_tx.h> #include <common/initial_commit_tx.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <stdio.h> #include <stdio.h>
static bool verbose = false; static bool verbose = false;

1
devtools/mkcommit.c
View file

@ -23,7 +23,6 @@
#include <common/htlc_wire.h> #include <common/htlc_wire.h>
#include <common/key_derive.h> #include <common/key_derive.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/version.h> #include <common/version.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

1
devtools/mkfunding.c
View file

@ -14,7 +14,6 @@
#include <common/initial_commit_tx.h> #include <common/initial_commit_tx.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/utxo.h> #include <common/utxo.h>
#include <stdio.h> #include <stdio.h>

1
devtools/mkgossip.c
View file

@ -13,7 +13,6 @@
#include <ccan/opt/opt.h> #include <ccan/opt/opt.h>
#include <ccan/str/hex/hex.h> #include <ccan/str/hex/hex.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>

1
devtools/print_wire.c
View file

@ -2,7 +2,6 @@
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/utf8/utf8.h> #include <ccan/utf8/utf8.h>
#include <common/decode_array.h> #include <common/decode_array.h>
#include <common/type_to_string.h>
#include <devtools/print_wire.h> #include <devtools/print_wire.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>

1
devtools/route.c
View file

@ -6,7 +6,6 @@
#include <common/gossmap.h> #include <common/gossmap.h>
#include <common/route.h> #include <common/route.h>
#include <common/setup.h> #include <common/setup.h>
#include <common/type_to_string.h>
#include <devtools/clean_topo.h> #include <devtools/clean_topo.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

1
devtools/topology.c
View file

@ -6,7 +6,6 @@
#include <common/dijkstra.h> #include <common/dijkstra.h>
#include <common/gossmap.h> #include <common/gossmap.h>
#include <common/route.h> #include <common/route.h>
#include <common/type_to_string.h>
#include <devtools/clean_topo.h> #include <devtools/clean_topo.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>

3
doc/contribute-to-core-lightning/coding-style-guidelines.md
View file

@ -104,8 +104,7 @@ Everything should be declared static and const by default. Note that `tal_free(
## Typesafety Is Worth Some Pain ## Typesafety Is Worth Some Pain
If code is typesafe, refactoring is as simple as changing a type and compiling to find where to refactor. We rely on this, so most places in the code will break if you hand the wrong type, eg If code is typesafe, refactoring is as simple as changing a type and compiling to find where to refactor. We rely on this, so most places in the code will break if you hand the wrong type, eg `structeq` and `tal`.
`type_to_string` and `structeq`.
The two tools we have to help us are complicated macros in `ccan/typesafe_cb` allow you to create callbacks which must match the type of their argument, rather than using `void *`. The other is `ARRAY_SIZE`, a macro which won't compile if you hand it a pointer instead of an actual array. The two tools we have to help us are complicated macros in `ccan/typesafe_cb` allow you to create callbacks which must match the type of their argument, rather than using `void *`. The other is `ARRAY_SIZE`, a macro which won't compile if you hand it a pointer instead of an actual array.

1
gossipd/Makefile
View file

@ -63,7 +63,6 @@ GOSSIPD_COMMON_OBJS := \
common/status_wire.o \ common/status_wire.o \
common/subdaemon.o \ common/subdaemon.o \
common/timeout.o \ common/timeout.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
gossipd/gossipd.c
View file

@ -21,7 +21,6 @@
#include <common/status.h> #include <common/status.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <connectd/connectd_gossipd_wiregen.h> #include <connectd/connectd_gossipd_wiregen.h>

1
gossipd/gossmap_manage.c
View file

@ -8,7 +8,6 @@
#include <common/gossmap.h> #include <common/gossmap.h>
#include <common/status.h> #include <common/status.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

1
gossipd/queries.c
View file

@ -8,7 +8,6 @@
#include <common/decode_array.h> #include <common/decode_array.h>
#include <common/gossmap.h> #include <common/gossmap.h>
#include <common/status.h> #include <common/status.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <gossipd/gossip_store.h> #include <gossipd/gossip_store.h>
#include <gossipd/gossipd.h> #include <gossipd/gossipd.h>

2
gossipd/sigcheck.c
View file

@ -2,7 +2,7 @@
#include <bitcoin/shadouble.h> #include <bitcoin/shadouble.h>
#include <bitcoin/signature.h> #include <bitcoin/signature.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/type_to_string.h> #include <common/utils.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <gossipd/sigcheck.h> #include <gossipd/sigcheck.h>

1
gossipd/test/Makefile
View file

@ -20,7 +20,6 @@ GOSSIPD_TEST_COMMON_OBJS := \
common/lease_rates.o \ common/lease_rates.o \
common/pseudorand.o \ common/pseudorand.o \
common/setup.o \ common/setup.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/wireaddr.o \ common/wireaddr.o \
gossipd/gossip_store_wiregen.o \ gossipd/gossip_store_wiregen.o \

1
hsmd/Makefile
View file

@ -48,7 +48,6 @@ HSMD_COMMON_OBJS := \
common/status_wire.o \ common/status_wire.o \
common/status_wiregen.o \ common/status_wiregen.o \
common/subdaemon.o \ common/subdaemon.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
hsmd/hsmd.c
View file

@ -19,7 +19,6 @@
#include <common/status.h> #include <common/status.h>
#include <common/status_wiregen.h> #include <common/status_wiregen.h>
#include <common/subdaemon.h> #include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
/*~ _wiregen files are autogenerated by tools/generate-wire.py */ /*~ _wiregen files are autogenerated by tools/generate-wire.py */

1
hsmd/libhsmd.c
View file

@ -7,7 +7,6 @@
#include <common/hash_u5.h> #include <common/hash_u5.h>
#include <common/key_derive.h> #include <common/key_derive.h>
#include <common/lease_rates.h> #include <common/lease_rates.h>
#include <common/type_to_string.h>
#include <hsmd/libhsmd.h> #include <hsmd/libhsmd.h>
#include <hsmd/permissions.h> #include <hsmd/permissions.h>
#include <inttypes.h> #include <inttypes.h>

1
lightningd/Makefile
View file

@ -142,7 +142,6 @@ LIGHTNINGD_COMMON_OBJS := \
common/timeout.o \ common/timeout.o \
common/trace.o \ common/trace.o \
common/tx_roles.o \ common/tx_roles.o \
common/type_to_string.o \
common/utils.o \ common/utils.o \
common/utxo.o \ common/utxo.o \
common/version.o \ common/version.o \

1
lightningd/anchorspend.c
View file

@ -7,7 +7,6 @@
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <channeld/channeld_wiregen.h> #include <channeld/channeld_wiregen.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>
#include <inttypes.h> #include <inttypes.h>

1
lightningd/chaintopology.c
View file

@ -12,7 +12,6 @@
#include <common/memleak.h> #include <common/memleak.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/trace.h> #include <common/trace.h>
#include <common/type_to_string.h>
#include <db/exec.h> #include <db/exec.h>
#include <lightningd/bitcoind.h> #include <lightningd/bitcoind.h>
#include <lightningd/chaintopology.h> #include <lightningd/chaintopology.h>

1
lightningd/channel.c
View file

@ -4,7 +4,6 @@
#include <common/closing_fee.h> #include <common/closing_fee.h>
#include <common/fee_states.h> #include <common/fee_states.h>
#include <common/json_command.h> #include <common/json_command.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <errno.h> #include <errno.h>

1
lightningd/channel_control.c
View file

@ -8,7 +8,6 @@
#include <common/json_stream.h> #include <common/json_stream.h>
#include <common/memleak.h> #include <common/memleak.h>
#include <common/shutdown_scriptpubkey.h> #include <common/shutdown_scriptpubkey.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <errno.h> #include <errno.h>

1
lightningd/channel_gossip.c
View file

@ -2,7 +2,6 @@
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <common/memleak.h> #include <common/memleak.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>

1
lightningd/closing_control.c
View file

@ -15,7 +15,6 @@
#include <common/json_param.h> #include <common/json_param.h>
#include <common/shutdown_scriptpubkey.h> #include <common/shutdown_scriptpubkey.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/utils.h> #include <common/utils.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <errno.h> #include <errno.h>

1
lightningd/coin_mvts.c
View file

@ -1,6 +1,5 @@
#include "config.h" #include "config.h"
#include <ccan/array_size/array_size.h> #include <ccan/array_size/array_size.h>
#include <common/type_to_string.h>
#include <lightningd/channel.h> #include <lightningd/channel.h>
#include <lightningd/coin_mvts.h> #include <lightningd/coin_mvts.h>
#include <lightningd/notification.h> #include <lightningd/notification.h>

1
lightningd/connect_control.c
View file

@ -7,7 +7,6 @@
#include <common/json_param.h> #include <common/json_param.h>
#include <common/memleak.h> #include <common/memleak.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <gossipd/gossipd_wiregen.h> #include <gossipd/gossipd_wiregen.h>
#include <hsmd/permissions.h> #include <hsmd/permissions.h>

1
lightningd/dual_open_control.c
View file

@ -14,7 +14,6 @@
#include <common/json_param.h> #include <common/json_param.h>
#include <common/psbt_open.h> #include <common/psbt_open.h>
#include <common/shutdown_scriptpubkey.h> #include <common/shutdown_scriptpubkey.h>
#include <common/type_to_string.h>
#include <common/wire_error.h> #include <common/wire_error.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <errno.h> #include <errno.h>

1
lightningd/gossip_control.c
View file

@ -9,7 +9,6 @@
#include <common/json_stream.h> #include <common/json_stream.h>
#include <common/node_id.h> #include <common/node_id.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <gossipd/gossipd_wiregen.h> #include <gossipd/gossipd_wiregen.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>

1
lightningd/hsm_control.c
View file

@ -10,7 +10,6 @@
#include <common/json_command.h> #include <common/json_command.h>
#include <common/json_param.h> #include <common/json_param.h>
#include <common/jsonrpc_errors.h> #include <common/jsonrpc_errors.h>
#include <common/type_to_string.h>
#include <errno.h> #include <errno.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>
#include <lightningd/hsm_control.h> #include <lightningd/hsm_control.h>

1
lightningd/htlc_end.c
View file

@ -4,7 +4,6 @@
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/htlc.h> #include <common/htlc.h>
#include <common/pseudorand.h> #include <common/pseudorand.h>
#include <common/type_to_string.h>
#include <lightningd/htlc_end.h> #include <lightningd/htlc_end.h>
#include <lightningd/log.h> #include <lightningd/log.h>

1
lightningd/htlc_set.c
View file

@ -1,7 +1,6 @@
#include "config.h" #include "config.h"
#include <common/features.h> #include <common/features.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <lightningd/channel.h> #include <lightningd/channel.h>
#include <lightningd/htlc_set.h> #include <lightningd/htlc_set.h>
#include <lightningd/invoice.h> #include <lightningd/invoice.h>

1
lightningd/invoice.c
View file

@ -16,7 +16,6 @@
#include <common/overflows.h> #include <common/overflows.h>
#include <common/random_select.h> #include <common/random_select.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/type_to_string.h>
#include <db/exec.h> #include <db/exec.h>
#include <errno.h> #include <errno.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>

14
lightningd/lightningd.c
View file

@ -56,7 +56,6 @@
#include <common/memleak.h> #include <common/memleak.h>
#include <common/timeout.h> #include <common/timeout.h>
#include <common/trace.h> #include <common/trace.h>
#include <common/type_to_string.h>
#include <common/version.h> #include <common/version.h>
#include <db/exec.h> #include <db/exec.h>
@ -1355,12 +1354,13 @@ int main(int argc, char *argv[])
/*~ Mark ourselves live. /*~ Mark ourselves live.
* *
* Note the use of type_to_string() here: it's a typesafe formatter, * Note the use of fmt_node_id() here: most complex types have a
* often handed 'tmpctx' like here to allocate a throwaway string for * string formatter of this convention, usually handed 'tmpctx' like
* formatting. json_escape() avoids printing weird characters in our * here to allocate a throwaway string for formatting. json_escape()
* log. And tal_hex() is a helper from utils which returns a hex string; * avoids printing weird characters in our log. And tal_hex() is a
* it's assumed that the argument was allocated with tal or tal_arr * helper from utils which returns a hex string; it's assumed that the
* so it can use tal_bytelen() to get the length. */ * argument was allocated with tal or tal_arr so it can use
* tal_bytelen() to get the length. */
log_info(ld->log, "--------------------------------------------------"); log_info(ld->log, "--------------------------------------------------");
log_info(ld->log, "Server started with public key %s, alias %s (color #%s) and lightningd %s", log_info(ld->log, "Server started with public key %s, alias %s (color #%s) and lightningd %s",
fmt_node_id(tmpctx, &ld->id), fmt_node_id(tmpctx, &ld->id),

1
lightningd/notification.c
View file

@ -1,7 +1,6 @@
#include "config.h" #include "config.h"
#include <ccan/cast/cast.h> #include <ccan/cast/cast.h>
#include <common/configdir.h> #include <common/configdir.h>
#include <common/type_to_string.h>
#include <lightningd/channel.h> #include <lightningd/channel.h>
#include <lightningd/coin_mvts.h> #include <lightningd/coin_mvts.h>
#include <lightningd/notification.h> #include <lightningd/notification.h>

1
lightningd/offer.c
View file

@ -7,7 +7,6 @@
#include <common/json_command.h> #include <common/json_command.h>
#include <common/json_param.h> #include <common/json_param.h>
#include <common/json_stream.h> #include <common/json_stream.h>
#include <common/type_to_string.h>
#include <errno.h> #include <errno.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>
#include <lightningd/hsm_control.h> #include <lightningd/hsm_control.h>

1
lightningd/onchain_control.c
View file

@ -6,7 +6,6 @@
#include <common/htlc_tx.h> #include <common/htlc_tx.h>
#include <common/key_derive.h> #include <common/key_derive.h>
#include <common/psbt_keypath.h> #include <common/psbt_keypath.h>
#include <common/type_to_string.h>
#include <db/exec.h> #include <db/exec.h>
#include <errno.h> #include <errno.h>
#include <hsmd/hsmd_wiregen.h> #include <hsmd/hsmd_wiregen.h>

1
lightningd/onion_message.c
View file

@ -4,7 +4,6 @@
#include <common/configdir.h> #include <common/configdir.h>
#include <common/json_command.h> #include <common/json_command.h>
#include <common/json_param.h> #include <common/json_param.h>
#include <common/type_to_string.h>
#include <connectd/connectd_wiregen.h> #include <connectd/connectd_wiregen.h>
#include <lightningd/channel.h> #include <lightningd/channel.h>
#include <lightningd/onion_message.h> #include <lightningd/onion_message.h>

Some files were not shown because too many files have changed in this diff Show more