Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 23:19:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use serde_cbor instead of serde_json

Browse Source 
We have serde trait implementations that use `serde_cbor` which is a superset of
josn. We cannot use `serder_json` to ser/deser these objects.
This commit is contained in:
Tobin C. Harding 2020-10-29 09:48:54 +11:00 committed by Lucas Soriano del Pino
parent 2bd4977fe4
commit 39f86154ce
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swap/src/network/request_response.rs
View File

@ -68,8 +68,9 @@ impl RequestResponseCodec for Codec {
let message = upgrade::read_one(io, BUF_SIZE) let message = upgrade::read_one(io, BUF_SIZE)
.await .await
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
let mut de = serde_json::Deserializer::from_slice(&message); let mut de = serde_cbor::Deserializer::from_slice(&message);
let msg = BobToAlice::deserialize(&mut de)?; let msg = BobToAlice::deserialize(&mut de)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
Ok(msg) Ok(msg)
} }
@ -85,8 +86,9 @@ impl RequestResponseCodec for Codec {
let message = upgrade::read_one(io, BUF_SIZE) let message = upgrade::read_one(io, BUF_SIZE)
.await .await
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?; .map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
let mut de = serde_json::Deserializer::from_slice(&message); let mut de = serde_cbor::Deserializer::from_slice(&message);
let msg = AliceToBob::deserialize(&mut de)?; let msg = AliceToBob::deserialize(&mut de)
.map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
Ok(msg) Ok(msg)
} }
@ -100,7 +102,8 @@ impl RequestResponseCodec for Codec {
where where
T: AsyncWrite + Unpin + Send, T: AsyncWrite + Unpin + Send,
{ {
let bytes = serde_json::to_vec(&req)?; let bytes =
serde_cbor::to_vec(&req).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
upgrade::write_one(io, &bytes).await?; upgrade::write_one(io, &bytes).await?;
Ok(()) Ok(())
@ -115,7 +118,8 @@ impl RequestResponseCodec for Codec {
where where
T: AsyncWrite + Unpin + Send, T: AsyncWrite + Unpin + Send,
{ {
let bytes = serde_json::to_vec(&res)?; let bytes =
serde_cbor::to_vec(&res).map_err(|e| io::Error::new(io::ErrorKind::InvalidData, e))?;
upgrade::write_one(io, &bytes).await?; upgrade::write_one(io, &bytes).await?;
Ok(()) Ok(())