Browse Source

type_to_string: add channel_id

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 8 years ago
parent
commit
e3d966c102
  1. 1
      type_to_string.h
  2. 8
      wire/fromwire.c

1
type_to_string.h

@ -19,6 +19,7 @@ union printable_types {
const struct channel_oneside *channel_oneside; const struct channel_oneside *channel_oneside;
const struct netaddr *netaddr; const struct netaddr *netaddr;
const secp256k1_pubkey *secp256k1_pubkey; const secp256k1_pubkey *secp256k1_pubkey;
const struct channel_id *channel_id;
const char *charp_; const char *charp_;
}; };

8
wire/fromwire.c

@ -3,6 +3,8 @@
#include <bitcoin/pubkey.h> #include <bitcoin/pubkey.h>
#include <ccan/endian/endian.h> #include <ccan/endian/endian.h>
#include <ccan/mem/mem.h> #include <ccan/mem/mem.h>
#include <ccan/tal/str/str.h>
#include <type_to_string.h>
/* Sets *cursor to NULL and returns NULL when extraction fails. */ /* Sets *cursor to NULL and returns NULL when extraction fails. */
static const void *fail_pull(const u8 **cursor, size_t *max) 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++) for (i = 0; i < num; i++)
fromwire_signature(cursor, max, arr + 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);

Loading…
Cancel
Save