f Inline now single-callsite methods

Author: tnull

src/wallet.rs

@@ -80,7 +80,11 @@ where
 			ConfirmationTarget::HighPriority,
 		];
 		for target in confirmation_targets {
-			let num_blocks = num_blocks_from_conf_target(target);
+			let num_blocks = match target {
+				ConfirmationTarget::Background => 12,
+				ConfirmationTarget::Normal => 6,
+				ConfirmationTarget::HighPriority => 3,
+			};
 
 			let est_fee_rate = self.blockchain.estimate_fee(num_blocks).await;
 
@@ -151,8 +155,14 @@ where
 	fn estimate_fee_rate(&self, confirmation_target: ConfirmationTarget) -> FeeRate {
 		let locked_fee_rate_cache = self.fee_rate_cache.read().unwrap();
 
+		let fallback_sats_kwu = match confirmation_target {
+			ConfirmationTarget::Background => FEERATE_FLOOR_SATS_PER_KW,
+			ConfirmationTarget::Normal => 2000,
+			ConfirmationTarget::HighPriority => 5000,
+		};
+
 		// We'll fall back on this, if we really don't have any other information.
-		let fallback_rate = fallback_fee_from_conf_target(confirmation_target);
+		let fallback_rate = FeeRate::from_sat_per_kwu(fallback_sats_kwu as f32);
 
 		*locked_fee_rate_cache.get(&confirmation_target).unwrap_or(&fallback_rate)
 	}
@@ -194,21 +204,3 @@ where
 		}
 	}
 }
-
-fn num_blocks_from_conf_target(confirmation_target: ConfirmationTarget) -> usize {
-	match confirmation_target {
-		ConfirmationTarget::Background => 12,
-		ConfirmationTarget::Normal => 6,
-		ConfirmationTarget::HighPriority => 3,
-	}
-}
-
-fn fallback_fee_from_conf_target(confirmation_target: ConfirmationTarget) -> FeeRate {
-	let sats_kwu = match confirmation_target {
-		ConfirmationTarget::Background => FEERATE_FLOOR_SATS_PER_KW,
-		ConfirmationTarget::Normal => 2000,
-		ConfirmationTarget::HighPriority => 5000,
-	};
-
-	FeeRate::from_sat_per_kwu(sats_kwu as f32)
-}