f Cleanup amount confusion, fix send_using_amount

Author: tnull

src/payment/bolt12.rs

@@ -51,7 +51,6 @@ impl Bolt12Payment {
 		}
 
 		let quantity = None;
-		let amount_msats = None;
 		let mut random_bytes = [0u8; 32];
 		rand::thread_rng().fill_bytes(&mut random_bytes);
 		let payment_id = PaymentId(random_bytes);
@@ -73,7 +72,7 @@ impl Bolt12Payment {
 		match self.channel_manager.pay_for_offer(
 			&offer,
 			quantity,
-			amount_msats,
+			None,
 			payer_note,
 			payment_id,
 			retry_strategy,
@@ -83,7 +82,7 @@ impl Bolt12Payment {
 				let payee_pubkey = offer.signing_pubkey();
 				log_info!(
 					self.logger,
-					"Initiated sending {:?} to {:?}",
+					"Initiated sending {}msat to {:?}",
 					offer_amount_msat,
 					payee_pubkey
 				);
@@ -149,7 +148,6 @@ impl Bolt12Payment {
 		}
 
 		let quantity = None;
-		let amount_msats = None;
 		let mut random_bytes = [0u8; 32];
 		rand::thread_rng().fill_bytes(&mut random_bytes);
 		let payment_id = PaymentId(random_bytes);
@@ -175,19 +173,18 @@ impl Bolt12Payment {
 		match self.channel_manager.pay_for_offer(
 			&offer,
 			quantity,
-			amount_msats,
+			Some(amount_msat),
 			payer_note,
 			payment_id,
 			retry_strategy,
 			max_total_routing_fee_msat,
 		) {
 			Ok(()) => {
 				let payee_pubkey = offer.signing_pubkey();
-				let offer_amount_msat = offer.amount();
 				log_info!(
 					self.logger,
-					"Initiated sending {:?} to {:?}",
-					offer_amount_msat,
+					"Initiated sending {}msat to {:?}",
+					amount_msat,
 					payee_pubkey
 				);