plugins/spender/fundchannel.c: Make fundchannel a thin layer around m…

…ultifundchannel.

Changelog-Changed: protocol: `fundchannel` now shuffles inputs and outputs, and no longer follows BIP69.

plugins/.gitignore

@@ -1,6 +1,5 @@
 autoclean
 bcli
-fundchannel
 pay
 spenderp
 multifundchannel

plugins/Makefile

@@ -4,9 +4,6 @@ PLUGIN_PAY_OBJS := $(PLUGIN_PAY_SRC:.c=.o)
 PLUGIN_AUTOCLEAN_SRC := plugins/autoclean.c
 PLUGIN_AUTOCLEAN_OBJS := $(PLUGIN_AUTOCLEAN_SRC:.c=.o)
 
-PLUGIN_FUNDCHANNEL_SRC := plugins/fundchannel.c
-PLUGIN_FUNDCHANNEL_OBJS := $(PLUGIN_FUNDCHANNEL_SRC:.c=.o)
-
 PLUGIN_TXPREPARE_SRC := plugins/txprepare.c
 PLUGIN_TXPREPARE_OBJS := $(PLUGIN_TXPREPARE_SRC:.c=.o)
 
@@ -25,18 +22,20 @@ PLUGIN_PAY_LIB_HEADER := plugins/libplugin-pay.h
 PLUGIN_PAY_LIB_OBJS := $(PLUGIN_PAY_LIB_SRC:.c=.o)
 
 PLUGIN_SPENDER_SRC :=				\
+	plugins/spender/fundchannel.c		\
 	plugins/spender/main.c			\
 	plugins/spender/multifundchannel.c	\
 	plugins/spender/multiwithdraw.c
 PLUGIN_SPENDER_HEADER :=			\
 	plugins/spender/multifundchannel.h	\
-	plugins/spender/multiwithdraw.h
+	plugins/spender/multiwithdraw.h		\
+	plugins/spender/fundchannel.h		\
+	plugins/spender/multifundchannel.h
 PLUGIN_SPENDER_OBJS := $(PLUGIN_SPENDER_SRC:.c=.o)
 
 PLUGIN_ALL_SRC :=				\
 	$(PLUGIN_AUTOCLEAN_SRC)			\
 	$(PLUGIN_BCLI_SRC)			\
-	$(PLUGIN_FUNDCHANNEL_SRC)		\
 	$(PLUGIN_KEYSEND_SRC)			\
 	$(PLUGIN_TXPREPARE_SRC)			\
 	$(PLUGIN_LIB_SRC)			\
@@ -52,7 +51,6 @@ PLUGIN_ALL_OBJS := $(PLUGIN_ALL_SRC:.c=.o)
 PLUGINS :=					\
 	plugins/autoclean			\
 	plugins/bcli				\
-	plugins/fundchannel			\
 	plugins/keysend				\
 	plugins/pay				\
 	plugins/txprepare			\
@@ -108,8 +106,6 @@ $(PLUGIN_PAY_OBJS): $(PLUGIN_PAY_LIB_HEADER)
 
 plugins/autoclean: bitcoin/chainparams.o $(PLUGIN_AUTOCLEAN_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
 
-plugins/fundchannel: common/addr.o $(PLUGIN_FUNDCHANNEL_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
-
 plugins/txprepare: bitcoin/chainparams.o $(PLUGIN_TXPREPARE_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)
 
 plugins/bcli: bitcoin/chainparams.o $(PLUGIN_BCLI_OBJS) $(PLUGIN_LIB_OBJS) $(PLUGIN_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS)