f rebase error

TheBlueMatt · TheBlueMatt · commit bc26c21cf406 · 2024-09-16T16:48:35.000Z
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
@@ -488,7 +488,9 @@ impl Verification for PaymentId {
 	) -> Result<(), ()> {
 		signer::verify_payment_id(*self, hmac, nonce, expanded_key)
 	}
+}
 
+impl PaymentId {
 	fn for_inbound_from_htlcs<I: Iterator<Item=(ChannelId, u64)>>(key: &[u8; 32], htlcs: I) -> PaymentId {
 		let mut prev_pair = None;
 		let mut hasher = HmacEngine::new(key);

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,9 @@ impl Verification for PaymentId {`
`488`	`488`	`) -> Result<(), ()> {`
`489`	`489`	`signer::verify_payment_id(*self, hmac, nonce, expanded_key)`
`490`	`490`	`}`
	`491`	`+}`
`491`	`492`
	`493`	`+impl PaymentId {`
`492`	`494`	`fn for_inbound_from_htlcs<I: Iterator<Item=(ChannelId, u64)>>(key: &[u8; 32], htlcs: I) -> PaymentId {`
`493`	`495`	`let mut prev_pair = None;`
`494`	`496`	`let mut hasher = HmacEngine::new(key);`