From 857ff561bcbfddcedf89a3725c3a56a1b68f002a Mon Sep 17 00:00:00 2001
From: niftynei <niftynei@gmail.com>
Date: Mon, 14 Dec 2020 12:59:27 -0600
Subject: [PATCH] df: move callback up

We're going to call it from the deserialization method here soon
---
 lightningd/dual_open_control.c | 101 +++++++++++++++++----------------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c
index a8fcbe2e0..9f4b21b01 100644
--- a/lightningd/dual_open_control.c
+++ b/lightningd/dual_open_control.c
@@ -354,6 +354,57 @@ static void openchannel2_remove_dualopend(struct subd *dualopend,
 	payload->dualopend = NULL;
 }
 
+static void
+openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
+{
+	struct subd *dualopend = payload->dualopend;
+	u8 *msg;
+
+	/* Free payload regardless of what happens next */
+	tal_steal(tmpctx, payload);
+
+	/* If our daemon died, we're done */
+	if (!dualopend)
+		return;
+
+	tal_del_destructor2(dualopend, openchannel2_remove_dualopend, payload);
+
+	/* If there's no plugin, the funding_feerate_per_kw will be zero.
+	 * In this case, we set the funding_feerate_per_kw to the default,
+	 * the 'best' */
+	if (payload->funding_feerate_per_kw == 0) {
+		u32 best_feerate
+			= payload->funding_feerate_per_kw
+			= payload->funding_feerate_best;
+
+		/* We use the old checks here now, against the base feerate */
+		if (best_feerate < payload->feerate_our_min) {
+			msg = towire_dualopend_fail(NULL, tal_fmt(tmpctx,
+						    "feerate_per_kw %u below"
+						    " minimum %u",
+						    best_feerate,
+						    payload->feerate_our_min));
+			return subd_send_msg(dualopend, take(msg));
+		}
+		if (best_feerate > payload->feerate_our_max) {
+			msg = towire_dualopend_fail(NULL, tal_fmt(tmpctx,
+						    "feerate_per_kw %u above"
+						    " maximum %u",
+						    best_feerate,
+						    payload->feerate_our_max));
+			return subd_send_msg(dualopend, take(msg));
+		}
+	}
+
+	msg = towire_dualopend_got_offer_reply(NULL, payload->accepter_funding,
+					       payload->funding_feerate_per_kw,
+					       payload->psbt,
+					       payload->our_shutdown_scriptpubkey);
+
+	subd_send_msg(dualopend, take(msg));
+}
+
+
 static bool
 openchannel2_hook_deserialize(struct openchannel2_payload *payload,
 			      const char *buffer,
@@ -416,56 +467,6 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,
 	return true;
 }
 
-static void
-openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
-{
-	struct subd *dualopend = payload->dualopend;
-	u8 *msg;
-
-	/* Free payload regardless of what happens next */
-	tal_steal(tmpctx, payload);
-
-	/* If our daemon died, we're done */
-	if (!dualopend)
-		return;
-
-	tal_del_destructor2(dualopend, openchannel2_remove_dualopend, payload);
-
-	/* If there's no plugin, the funding_feerate_per_kw will be zero.
-	 * In this case, we set the funding_feerate_per_kw to the default,
-	 * the 'best' */
-	if (payload->funding_feerate_per_kw == 0) {
-		u32 best_feerate
-			= payload->funding_feerate_per_kw
-			= payload->funding_feerate_best;
-
-		/* We use the old checks here now, against the base feerate */
-		if (best_feerate < payload->feerate_our_min) {
-			msg = towire_dualopend_fail(NULL, tal_fmt(tmpctx,
-						    "feerate_per_kw %u below"
-						    " minimum %u",
-						    best_feerate,
-						    payload->feerate_our_min));
-			return subd_send_msg(dualopend, take(msg));
-		}
-		if (best_feerate > payload->feerate_our_max) {
-			msg = towire_dualopend_fail(NULL, tal_fmt(tmpctx,
-						    "feerate_per_kw %u above"
-						    " maximum %u",
-						    best_feerate,
-						    payload->feerate_our_max));
-			return subd_send_msg(dualopend, take(msg));
-		}
-	}
-
-	msg = towire_dualopend_got_offer_reply(NULL, payload->accepter_funding,
-					       payload->funding_feerate_per_kw,
-					       payload->psbt,
-					       payload->our_shutdown_scriptpubkey);
-
-	subd_send_msg(dualopend, take(msg));
-}
-
 /* dualopend dies?  Remove dualopend ptr from payload */
 static void
 openchannel2_psbt_remove_dualopend(struct subd *dualopend,