zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't use a fixed size of serialized ValueBalance (#8732)

This commit is contained in:
Marek 2024-07-31 18:09:24 +02:00 committed by GitHub
parent 8b8a7a4ac5
commit 45261a26eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra-chain/src/value_balance.rs
View File

@ -348,7 +348,7 @@ impl ValueBalance<NonNegative> {
/// From byte array
#[allow(clippy::unwrap_in_result)]
pub fn from_bytes(bytes: [u8; 32]) -> Result<ValueBalance<NonNegative>, ValueBalanceError> {
pub fn from_bytes(bytes: &[u8]) -> Result<ValueBalance<NonNegative>, ValueBalanceError> {
let transparent = Amount::from_bytes(
bytes[0..8]
.try_into()

8
zebra-chain/src/value_balance/tests/prop.rs
View File

@ -109,8 +109,7 @@ proptest! {
fn value_balance_serialization(value_balance in any::<ValueBalance<NonNegative>>()) {
let _init_guard = zebra_test::init();
let bytes = value_balance.to_bytes();
let serialized_value_balance = ValueBalance::from_bytes(bytes)?;
let serialized_value_balance = ValueBalance::from_bytes(&value_balance.to_bytes())?;
prop_assert_eq!(value_balance, serialized_value_balance);
}
@ -119,9 +118,8 @@ proptest! {
fn value_balance_deserialization(bytes in any::<[u8; 32]>()) {
let _init_guard = zebra_test::init();
if let Ok(deserialized) = ValueBalance::<NonNegative>::from_bytes(bytes) {
let bytes2 = deserialized.to_bytes();
prop_assert_eq!(bytes, bytes2);
if let Ok(deserialized) = ValueBalance::<NonNegative>::from_bytes(&bytes) {
prop_assert_eq!(bytes, deserialized.to_bytes());
}
}
}

3
zebra-state/src/service/finalized_state/disk_format/chain.rs
View File

@ -30,8 +30,7 @@ impl IntoDisk for ValueBalance<NonNegative> {
impl FromDisk for ValueBalance<NonNegative> {
fn from_bytes(bytes: impl AsRef<[u8]>) -> Self {
let array = bytes.as_ref().try_into().unwrap();
ValueBalance::from_bytes(array).unwrap()
ValueBalance::from_bytes(bytes.as_ref()).expect("ValueBalance should be parsable")
}
}