X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Futil%2Fser.rs;fp=lightning%2Fsrc%2Futil%2Fser.rs;h=7e4f789097940824a8ebfb3f1bb9f054cf3e145d;hb=edab29e8d834db2b2015b5aaff1c6ff3828ab048;hp=a2ef16b5e2462c51dd22f7c4444cd0cf7b22460a;hpb=71e69950869a538d9fe899fbbebe38da890ba007;p=rust-lightning

diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index a2ef16b5..7e4f7890 100644
--- a/lightning/src/util/ser.rs
+++ b/lightning/src/util/ser.rs
@@ -5,6 +5,7 @@ use std::result::Result;
 use std::io::{Read, Write};
 use std::collections::HashMap;
 use std::hash::Hash;
+use std::sync::Mutex;
 
 use secp256k1::Signature;
 use secp256k1::key::{PublicKey, SecretKey};
@@ -442,3 +443,29 @@ impl<R: Read> Readable<R> for OutPoint {
 		})
 	}
 }
+
+impl<R: Read, T: Readable<R>> Readable<R> for Mutex<T> {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		let t: T = Readable::read(r)?;
+		Ok(Mutex::new(t))
+	}
+}
+impl<T: Writeable> Writeable for Mutex<T> {
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+		self.lock().unwrap().write(w)
+	}
+}
+
+impl<R: Read, A: Readable<R>, B: Readable<R>> Readable<R> for (A, B) {
+	fn read(r: &mut R) -> Result<Self, DecodeError> {
+		let a: A = Readable::read(r)?;
+		let b: B = Readable::read(r)?;
+		Ok((a, b))
+	}
+}
+impl<A: Writeable, B: Writeable> Writeable for (A, B) {
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+		self.0.write(w)?;
+		self.1.write(w)
+	}
+}