Also encode chan. upd. prefix in decode_update_add_htlc_onion

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -2250,7 +2250,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					break None;
 				}
 				{
-					let mut res = VecWriter(Vec::with_capacity(chan_update.serialized_length() + 8 + 2));
+					let mut res = VecWriter(Vec::with_capacity(chan_update.serialized_length() + 2 + 8 + 2));
 					if let Some(chan_update) = chan_update {
 						if code == 0x1000 | 11 || code == 0x1000 | 12 {
 							msg.amount_msat.write(&mut res).expect("Writes cannot fail");
@@ -2262,7 +2262,8 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 							// TODO: underspecified, follow https://github.com/lightningnetwork/lightning-rfc/issues/791
 							0u16.write(&mut res).expect("Writes cannot fail");
 						}
-						(chan_update.serialized_length() as u16).write(&mut res).expect("Writes cannot fail");
+						(chan_update.serialized_length() as u16 + 2).write(&mut res).expect("Writes cannot fail");
+						msgs::ChannelUpdate::TYPE.write(&mut res).expect("Writes cannot fail");
 						chan_update.write(&mut res).expect("Writes cannot fail");
 					}
 					return_err!(err, code, &res.0[..]);
@@ -3550,8 +3551,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				0u16.write(&mut enc).expect("Writes cannot fail");
 			}
 			(upd.serialized_length() as u16 + 2).write(&mut enc).expect("Writes cannot fail");
-			let chan_update_type = msgs::ChannelUpdate::TYPE;
-			chan_update_type.write(&mut enc).expect("Writes cannot fail");
+			msgs::ChannelUpdate::TYPE.write(&mut enc).expect("Writes cannot fail");
 			upd.write(&mut enc).expect("Writes cannot fail");
 			(desired_err_code, enc.0)
 		} else {