X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser.rs;h=83059620ed3f3382be4b349197efa1b357de72cf;hb=eab9b3452657cef788eb54e3f46eda4fb06f9197;hp=0b5036bd749424dd4529cb23481d5e01236d6974;hpb=35573bb3d7bf8c7f7b9d8759afa555aec2735a44;p=rust-lightning

diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index 0b5036bd..83059620 100644
--- a/lightning/src/util/ser.rs
+++ b/lightning/src/util/ser.rs
@@ -528,6 +528,36 @@ impl<K, V> Readable for HashMap<K, V>
 	}
 }
 
+// HashSet
+impl<T> Writeable for HashSet<T>
+where T: Writeable + Eq + Hash
+{
+	#[inline]
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
+		(self.len() as u16).write(w)?;
+		for item in self.iter() {
+			item.write(w)?;
+		}
+		Ok(())
+	}
+}
+
+impl<T> Readable for HashSet<T>
+where T: Readable + Eq + Hash
+{
+	#[inline]
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let len: u16 = Readable::read(r)?;
+		let mut ret = HashSet::with_capacity(len as usize);
+		for _ in 0..len {
+			if !ret.insert(T::read(r)?) {
+				return Err(DecodeError::InvalidValue)
+			}
+		}
+		Ok(ret)
+	}
+}
+
 // Vectors
 impl Writeable for Vec<u8> {
 	#[inline]
@@ -867,3 +897,20 @@ impl Readable for () {
 		Ok(())
 	}
 }
+
+impl Writeable for String {
+	#[inline]
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
+		(self.len() as u16).write(w)?;
+		w.write_all(self.as_bytes())
+	}
+}
+
+impl Readable for String {
+	#[inline]
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let v: Vec<u8> = Readable::read(r)?;
+		let ret = String::from_utf8(v).map_err(|_| DecodeError::InvalidValue)?;
+		Ok(ret)
+	}
+}