Merge pull request #1096 from valentinewallace/2021-09-mpp-retries

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -5516,7 +5516,7 @@ mod tests {
 	use bitcoin::hashes::hex::FromHex;
 	use hex;
 	use ln::{PaymentPreimage, PaymentHash};
-	use ln::channelmanager::{HTLCSource, MppId};
+	use ln::channelmanager::{HTLCSource, PaymentId};
 	use ln::channel::{Channel,InboundHTLCOutput,OutboundHTLCOutput,InboundHTLCState,OutboundHTLCState,HTLCOutputInCommitment,HTLCCandidate,HTLCInitiator,TxCreationKeys};
 	use ln::channel::MAX_FUNDING_SATOSHIS;
 	use ln::features::InitFeatures;
@@ -5690,7 +5690,7 @@ mod tests {
 				path: Vec::new(),
 				session_priv: SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap(),
 				first_hop_htlc_msat: 548,
-				mpp_id: MppId([42; 32]),
+				payment_id: PaymentId([42; 32]),
 			}
 		});