Merge pull request #155 from SWvheerden/patch-1

TheBlueMatt · TheBlueMatt · commit 0c8d40246090 · 2018-09-06T10:50:16.000-04:00
patch to change temp_channel from deserialise to copy
diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
@@ -681,10 +681,11 @@ impl MsgDecodable for OpenChannel {
 			}
 			shutdown_scriptpubkey = Some(Script::from(v[321..321+len].to_vec()));
 		}
-
+		let mut temp_channel_id = [0; 32];
+		temp_channel_id[..].copy_from_slice(&v[32..64]);
 		Ok(OpenChannel {
 			chain_hash: deserialize(&v[0..32]).unwrap(),
-			temporary_channel_id: deserialize(&v[32..64]).unwrap(),
+			temporary_channel_id: temp_channel_id,
 			funding_satoshis: byte_utils::slice_to_be64(&v[64..72]),
 			push_msat: byte_utils::slice_to_be64(&v[72..80]),
 			dust_limit_satoshis: byte_utils::slice_to_be64(&v[80..88]),

Original file line number	Diff line number	Diff line change
`@@ -681,10 +681,11 @@ impl MsgDecodable for OpenChannel {`
`681`	`681`	`}`
`682`	`682`	`shutdown_scriptpubkey = Some(Script::from(v[321..321+len].to_vec()));`
`683`	`683`	`}`
`684`		`-`
	`684`	`+ let mut temp_channel_id = [0; 32];`
	`685`	`+ temp_channel_id[..].copy_from_slice(&v[32..64]);`
`685`	`686`	`Ok(OpenChannel {`
`686`	`687`	`chain_hash: deserialize(&v[0..32]).unwrap(),`
`687`		`- temporary_channel_id: deserialize(&v[32..64]).unwrap(),`
	`688`	`+ temporary_channel_id: temp_channel_id,`
`688`	`689`	`funding_satoshis: byte_utils::slice_to_be64(&v[64..72]),`
`689`	`690`	`push_msat: byte_utils::slice_to_be64(&v[72..80]),`
`690`	`691`	`dust_limit_satoshis: byte_utils::slice_to_be64(&v[80..88]),`