From 1e173463c9651e6bc2c6e1a06403d50fff662891 Mon Sep 17 00:00:00 2001
From: niftynei <niftynei@gmail.com>
Date: Mon, 26 Oct 2020 13:42:08 -0500
Subject: [PATCH] df: rename 'feerate_per_kw' to 'feerate_per_kw_commitment'

Differentiate btw feerate for commitment txs and feerate for funding
transaction.
---
 openingd/dualopend.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/openingd/dualopend.c b/openingd/dualopend.c
index d4c5920ce..83a408c21 100644
--- a/openingd/dualopend.c
+++ b/openingd/dualopend.c
@@ -100,7 +100,7 @@ struct state {
 	enum tx_role our_role;
 
 	u32 feerate_per_kw_funding;
-	u32 feerate_per_kw;
+	u32 feerate_per_kw_commitment;
 
 	struct bitcoin_txid funding_txid;
 	u16 funding_txout;
@@ -1146,7 +1146,7 @@ static u8 *accepter_start(struct state *state, const u8 *oc2_msg)
 				    &state->remoteconf.dust_limit,
 				    &state->remoteconf.max_htlc_value_in_flight,
 				    &state->remoteconf.htlc_minimum,
-				    &state->feerate_per_kw,
+				    &state->feerate_per_kw_commitment,
 				    &state->remoteconf.to_self_delay,
 				    &state->remoteconf.max_accepted_htlcs,
 				    &state->tx_locktime,
@@ -1214,7 +1214,7 @@ static u8 *accepter_start(struct state *state, const u8 *oc2_msg)
 					 feerate_max,
 					 feerate_min,
 					 feerate_best,
-					 state->feerate_per_kw,
+					 state->feerate_per_kw_commitment,
 					 state->remoteconf.to_self_delay,
 					 state->remoteconf.max_accepted_htlcs,
 					 channel_flags,
@@ -1278,7 +1278,8 @@ static u8 *accepter_start(struct state *state, const u8 *oc2_msg)
 	/* Now that we know the total of the channel, we can set the reserve */
 	set_reserve(state, total);
 
-	if (!check_config_bounds(tmpctx, total, state->feerate_per_kw,
+	if (!check_config_bounds(tmpctx, total,
+				 state->feerate_per_kw_commitment,
 				 state->max_to_self_delay,
 				 state->min_effective_htlc_capacity,
 				 &state->remoteconf,
@@ -1390,7 +1391,7 @@ static u8 *accepter_start(struct state *state, const u8 *oc2_msg)
 					     our_msats,
 					     take(new_fee_states(
 							     NULL, REMOTE,
-							     &state->feerate_per_kw)),
+							     &state->feerate_per_kw_commitment)),
 					     &state->localconf,
 					     &state->remoteconf,
 					     &state->our_points, &state->their_points,
@@ -1503,7 +1504,7 @@ static u8 *accepter_start(struct state *state, const u8 *oc2_msg)
 					    total,
 					    state->accepter_funding,
 					    channel_flags,
-					    state->feerate_per_kw,
+					    state->feerate_per_kw_commitment,
 					    msg,
 					    state->localconf.channel_reserve,
 					    state->upfront_shutdown_script[LOCAL],
@@ -1535,7 +1536,7 @@ static u8 *opener_start(struct state *state, u8 *msg)
 					  &psbt,
 					  &state->opener_funding,
 					  &state->upfront_shutdown_script[LOCAL],
-					  &state->feerate_per_kw,
+					  &state->feerate_per_kw_commitment,
 					  &state->feerate_per_kw_funding,
 					  &channel_flags))
 		master_badmsg(WIRE_DUAL_OPEN_OPENER_INIT, msg);
@@ -1586,7 +1587,7 @@ static u8 *opener_start(struct state *state, u8 *msg)
 				   state->localconf.dust_limit,
 				   state->localconf.max_htlc_value_in_flight,
 				   state->localconf.htlc_minimum,
-				   state->feerate_per_kw,
+				   state->feerate_per_kw_commitment,
 				   state->localconf.to_self_delay,
 				   state->localconf.max_accepted_htlcs,
 				   state->tx_locktime,
@@ -1717,7 +1718,8 @@ static u8 *opener_start(struct state *state, u8 *msg)
 	 * set the reserve */
 	set_reserve(state, total);
 
-	if (!check_config_bounds(tmpctx, total, state->feerate_per_kw,
+	if (!check_config_bounds(tmpctx, total,
+				 state->feerate_per_kw_commitment,
 				 state->max_to_self_delay,
 				 state->min_effective_htlc_capacity,
 				 &state->remoteconf,
@@ -1776,7 +1778,7 @@ static u8 *opener_start(struct state *state, u8 *msg)
 					     total,
 					     our_msats,
 					     take(new_fee_states(NULL, LOCAL,
-								 &state->feerate_per_kw)),
+								 &state->feerate_per_kw_commitment)),
 					     &state->localconf,
 					     &state->remoteconf,
 					     &state->our_points,
@@ -1927,7 +1929,7 @@ static u8 *opener_start(struct state *state, u8 *msg)
 					    total,
 					    state->opener_funding,
 					    channel_flags,
-					    state->feerate_per_kw,
+					    state->feerate_per_kw_commitment,
 					    NULL,
 					    state->localconf.channel_reserve,
 					    state->upfront_shutdown_script[LOCAL],