github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

latest master and ser&des update fn arguments (#631)

Browse Source
This commit is contained in:
deevope
2021-12-13 15:53:46 +00:00
committed by GitHub
parent 1f35feed00
commit 041b182fcc
4 changed files with 88 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libwallet/src/slate_versions/v4_bin.rs
+6 -2
View File
@@ -401,8 +401,12 @@ impl<'de> serde::Deserialize<'de> for SlateV4Bin {
E: serde::de::Error,
{
let mut reader = std::io::Cursor::new(value.to_vec());
let s = grin_ser::deserialize(&mut reader, grin_ser::ProtocolVersion(4))
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
let s = grin_ser::deserialize(
&mut reader,
grin_ser::ProtocolVersion(4),
grin_ser::DeserializationMode::default(),
)
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
Ok(s)
}
}
libwallet/src/slatepack/types.rs
+12 -4
View File
@@ -287,8 +287,12 @@ impl<'de> serde::Deserialize<'de> for SlatepackBin {
E: serde::de::Error,
{
let mut reader = std::io::Cursor::new(value.to_vec());
let s = ser::deserialize(&mut reader, ser::ProtocolVersion(4))
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
let s = ser::deserialize(
&mut reader,
ser::ProtocolVersion(4),
ser::DeserializationMode::default(),
)
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
Ok(s)
}
}
@@ -515,8 +519,12 @@ impl<'de> serde::Deserialize<'de> for SlatepackEncMetadataBin {
E: serde::de::Error,
{
let mut reader = std::io::Cursor::new(value.to_vec());
let s = ser::deserialize(&mut reader, ser::ProtocolVersion(4))
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
let s = ser::deserialize(
&mut reader,
ser::ProtocolVersion(4),
ser::DeserializationMode::default(),
)
.map_err(|err| serde::de::Error::custom(err.to_string()))?;
Ok(s)
}
}