From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Apr 2021 23:40:55 +0000 (+0100)
Subject: mgmtchannel: Switch to msgpack from json
X-Git-Tag: otter-0.6.0~526
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=04f1d2da809bf238306cd17aafc555024de383da;p=otter.git

mgmtchannel: Switch to msgpack from json

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs
index 36d55db5..3e0b7ab2 100644
--- a/src/mgmtchannel.rs
+++ b/src/mgmtchannel.rs
@@ -72,15 +72,15 @@ impl MgmtChannel {
   pub fn read<T:DeserializeOwned>(&mut self) -> T {
     use MgmtChannelReadError::*;
     let f = self.read.new_frame()?.ok_or(MgmtChannelReadError::EOF)?;
-    let r = serde_json::from_reader(f);
+    let r = rmp_serde::decode::from_read(f);
     let v = r.map_err(|e| Parse(format!("{}", &e)))?;
     v
   }
 
-  #[throws(io::Error)]
+  #[throws(MgmtChannelWriteError)]
   pub fn write<T:Serialize>(&mut self, val: &T) {
     let mut f = self.write.new_frame()?;
-    serde_json::to_writer(&mut f, val)?;
+    rmp_serde::encode::write_named(&mut f, val)?;
     f.finish()?;
     self.write.flush()?;
   }