better cur_block_height

Author: Evanfeenstra

lightning/src/ln/onion_utils.rs

@@ -936,17 +936,18 @@ pub(crate) fn decode_next_payment_hop<NS: Deref>(
 }
 
 /// Build a payment onion, returning the first hop msat and cltv values as well.
+/// `cur_block_height` should be set to the best known block height + 1.
 pub fn create_payment_onion<T: secp256k1::Signing>(
 	secp_ctx: &Secp256k1<T>, path: &Path, session_priv: &SecretKey, total_msat: u64,
-	recipient_onion: RecipientOnionFields, best_block_height: u32, payment_hash: &PaymentHash,
+	recipient_onion: RecipientOnionFields, cur_block_height: u32, payment_hash: &PaymentHash,
 	keysend_preimage: &Option<PaymentPreimage>, prng_seed: [u8; 32]
 ) -> Result<(msgs::OnionPacket, u64, u32), APIError> {
 	let onion_keys = construct_onion_keys(&secp_ctx, &path, &session_priv)
 		.map_err(|_| APIError::InvalidRoute{
 			err: "Pubkey along hop was maliciously selected".to_owned()
 		})?;
 	let (onion_payloads, htlc_msat, htlc_cltv) = build_onion_payloads(
-		&path, total_msat, recipient_onion, best_block_height, keysend_preimage
+		&path, total_msat, recipient_onion, cur_block_height, keysend_preimage
 	)?;
 	let onion_packet = construct_onion_packet(onion_payloads, onion_keys, prng_seed, payment_hash)
 		.map_err(|_| APIError::InvalidRoute{

lightning/src/onion_message/mod.rs

@@ -28,7 +28,6 @@ mod functional_tests;
 
 // Re-export structs so they can be imported with just the `onion_message::` module prefix.
 pub use self::messenger::{CustomOnionMessageHandler, DefaultMessageRouter, Destination, MessageRouter, OnionMessageContents, OnionMessagePath, OnionMessenger, PeeledOnion, PendingOnionMessage, SendError};
-pub use self::messenger::{create_onion_message, peel_onion_message};
 #[cfg(not(c_bindings))]
 pub use self::messenger::{SimpleArcOnionMessenger, SimpleRefOnionMessenger};
 pub use self::offers::{OffersMessage, OffersMessageHandler};