f rebase

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -13436,7 +13436,7 @@ macro_rules! create_offer_builder { ($self: ident, $builder: ty) => {
 		}
 
 		let builder = $self.flow.create_phantom_offer_builder(
-			&*$self.entropy_source, peers, path_count_limit
+			&$self.entropy_source, peers, path_count_limit
 		)?;
 
 		Ok(builder.into())

lightning/src/offers/flow.rs

@@ -678,7 +678,7 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
 		&self, entropy_source: ES, per_node_peers: Vec<(PublicKey, Vec<MessageForwardNode>)>,
 		path_count_limit: usize,
 	) -> Result<OfferBuilder<'_, DerivedMetadata, secp256k1::All>, Bolt12SemanticError> {
-		self.create_offer_builder_intern(&*entropy_source, |_, context, _| {
+		self.create_offer_builder_intern(entropy_source, |_, context, _| {
 			self.blinded_paths_for_phantom_offer(per_node_peers, path_count_limit, context)
 				.map_err(|_| Bolt12SemanticError::MissingPaths)
 		})