X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=fuzz%2Fsrc%2Fmsg_targets%2Futils.rs;h=7e3bf52e4c7cef431206173dc64f436560182642;hb=523cab8ef74bb8f51d5ad719decc02015a41fe6d;hp=2a7731ccd136d2185414b4b73f7510a7bebe8397;hpb=c906f2843234ba9164e562a19bccaabde0243d95;p=rust-lightning

diff --git a/fuzz/src/msg_targets/utils.rs b/fuzz/src/msg_targets/utils.rs
index 2a7731cc..7e3bf52e 100644
--- a/fuzz/src/msg_targets/utils.rs
+++ b/fuzz/src/msg_targets/utils.rs
@@ -28,7 +28,7 @@ macro_rules! test_msg {
 		{
 			use lightning::util::ser::{Writeable, Readable};
 			let mut r = ::std::io::Cursor::new($data);
-			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+			if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
 				let p = r.position() as usize;
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
@@ -48,11 +48,11 @@ macro_rules! test_msg_simple {
 		{
 			use lightning::util::ser::{Writeable, Readable};
 			let mut r = ::std::io::Cursor::new($data);
-			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+			if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
 
-				let msg = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
+				let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
 				let mut w_two = VecWriter(Vec::new());
 				msg.write(&mut w_two).unwrap();
 				assert_eq!(&w.0[..], &w_two.0[..]);
@@ -69,7 +69,7 @@ macro_rules! test_msg_exact {
 		{
 			use lightning::util::ser::{Writeable, Readable};
 			let mut r = ::std::io::Cursor::new($data);
-			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+			if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
 				assert_eq!(&r.into_inner()[..], &w.0[..]);
@@ -78,15 +78,15 @@ macro_rules! test_msg_exact {
 	}
 }
 
-// Tests a message that must survive roundtrip exactly, modulo one "hole" which may be set to 0s on
-// re-serialization.
+// Tests a message that must survive roundtrip exactly, modulo one "hole" which may be set to
+// any value on re-serialization.
 #[macro_export]
 macro_rules! test_msg_hole {
 	($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
 		{
 			use lightning::util::ser::{Writeable, Readable};
 			let mut r = ::std::io::Cursor::new($data);
-			if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+			if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
 				let mut w = VecWriter(Vec::new());
 				msg.write(&mut w).unwrap();
 				let p = w.0.len() as usize;