From e3d966c102dc06f79182d530470cd7d02e5de97e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 25 Jan 2017 10:02:53 +1030 Subject: [PATCH] type_to_string: add channel_id Signed-off-by: Rusty Russell --- type_to_string.h | 1 + wire/fromwire.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/type_to_string.h b/type_to_string.h index 146a42a64..c682985e0 100644 --- a/type_to_string.h +++ b/type_to_string.h @@ -19,6 +19,7 @@ union printable_types { const struct channel_oneside *channel_oneside; const struct netaddr *netaddr; const secp256k1_pubkey *secp256k1_pubkey; + const struct channel_id *channel_id; const char *charp_; }; diff --git a/wire/fromwire.c b/wire/fromwire.c index 863f96c1c..49440f530 100644 --- a/wire/fromwire.c +++ b/wire/fromwire.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include /* Sets *cursor to NULL and returns NULL when extraction fails. */ static const void *fail_pull(const u8 **cursor, size_t *max) @@ -153,3 +155,9 @@ void fromwire_signature_array(const u8 **cursor, size_t *max, for (i = 0; i < num; i++) fromwire_signature(cursor, max, arr + i); } + +static char *fmt_channel_id(const tal_t *ctx, const struct channel_id *id) +{ + return tal_fmt(ctx, "%u/%u/%u", id->blocknum, id->txnum, id->outnum); +} +REGISTER_TYPE_TO_STRING(channel_id, fmt_channel_id);