Other fixes in ser.rs

Remove Option<T> instead add Option<Script> equivalent
Remove Script serialization
Fix in Sha256dHash serialization

Author: yuntai

src/util/ser.rs

@@ -263,30 +263,38 @@ impl<R: Read, T: Readable<R>> Readable<R> for Vec<T> {
 	}
 }
 
-impl<W: Write, T: Writeable<W>> Writeable<W> for Option<T> {
-    #[inline]
-    fn write(&self, w: &mut Writer<W>) -> Result<(), Error> {
-        match self {
-            Some(data) => {
-                true.write(w)?;
-                data.write(w)?;
-            }
-            None => { false.write(w)?; }
-        }
-        Ok(())
-    }
+impl<W, T> Writeable<W> for Option<T>
+	where W: Write,
+				T: ::std::ops::Index<::std::ops::RangeFull, Output=[u8]>
+{
+	#[inline]
+	fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+		if let Some(data) = self {
+			data[..].write(w)?;
+		} else {
+			0u16.write(w)?;
+		}
+		Ok(())
+	}
 }
 
-impl<R: Read, T:Readable<R>> Readable<R> for Option<T> {
-    #[inline]
-    fn read(r: &mut Reader<R>) -> Result<Option<T>, Error> {
-        let f: bool = Readable::read(r)?;
-        Ok(if f {
-            Some(Readable::read(r)?)
-        } else {
-            None
-        })
-    }
+impl<R, T> Readable<R> for Option<T>
+	where R: Read,
+				T: From<Vec<u8>>,
+{
+	#[inline]
+	fn read(r: &mut Reader<R>) -> Result<Option<T>, DecodeError> {
+		match <u16 as Readable<R>>::read(r)? as usize {
+			0 => {
+				Ok(None)
+			},
+			len => {
+				let mut buf = vec![0; len];
+				r.read_exact(&mut buf)?;
+				Ok(Some(T::from(buf)))
+			}
+		}
+	}
 }
 
 impl<W: Write> Writeable<W> for PublicKey {
@@ -314,21 +322,7 @@ impl<W: Write> Writeable<W> for Sha256dHash {
 impl<R: Read> Readable<R> for Sha256dHash {
 	fn read(r: &mut Reader<R>) -> Result<Sha256dHash, DecodeError> {
 		let buf: [u8; 32] = Readable::read(r)?;
-		Ok(buf)
-	}
-}
-
-impl<W: Write> Writeable<W> for Script {
-	fn write(&self, w: &mut Writer<W>) -> Result<(), Error> {
-		self[..].write(w)
-	}
-}
-
-impl<R: Read> Readable<R> for Script {
-	fn read(r: &mut Reader<R>) -> Result<Script, Error> {
-		let sz: u16 = Readable::read(r)?;
-		let v = r.read_fixed_size(sz as usize)?;
-		Ok(Script::from(v))
+		Ok(Sha256dHash::from_data(&buf))
 	}
 }