From 269dbe585cb762e4a56c81abacfefbff07d3f510 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 20 Feb 2019 22:01:48 +1030
Subject: [PATCH] wire: move short_channel formatting functions into
 bitcoin/short_channel_id

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 bitcoin/short_channel_id.c | 5 +++++
 wire/fromwire.c            | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bitcoin/short_channel_id.c b/bitcoin/short_channel_id.c
index 7dd219794..ee3d2e833 100644
--- a/bitcoin/short_channel_id.c
+++ b/bitcoin/short_channel_id.c
@@ -1,5 +1,6 @@
 #include <bitcoin/short_channel_id.h>
 #include <ccan/tal/str/str.h>
+#include <common/type_to_string.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -95,3 +96,7 @@ char *short_channel_id_dir_to_str(const tal_t *ctx,
 	tal_free(scidstr);
 	return str;
 }
+
+REGISTER_TYPE_TO_STRING(short_channel_id, short_channel_id_to_str);
+REGISTER_TYPE_TO_STRING(short_channel_id_dir, short_channel_id_dir_to_str);
+
diff --git a/wire/fromwire.c b/wire/fromwire.c
index c5e435945..d4962e33f 100644
--- a/wire/fromwire.c
+++ b/wire/fromwire.c
@@ -241,8 +241,6 @@ char *fromwire_wirestring(const tal_t *ctx, const u8 **cursor, size_t *max)
 	return NULL;
 }
 
-REGISTER_TYPE_TO_STRING(short_channel_id, short_channel_id_to_str);
-REGISTER_TYPE_TO_STRING(short_channel_id_dir, short_channel_id_dir_to_str);
 REGISTER_TYPE_TO_HEXSTR(channel_id);
 
 /* BOLT #2: