Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-05-07 17:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to reading/writing order as found by test

Browse source
This commit is contained in:
yeastplume 2025-04-13 11:00:06 +01:00
parent eae7269069
commit ae0c3a892c
1 changed files with 10 additions and 10 deletions

20
core/src/core/pmmr/segment.rs
View file

@ -14,11 +14,11 @@
//! Segment of a PMMR.
use crate::core::hash::{Hash, Hashed};
use crate::core::pmmr::{self, Backend, ReadablePMMR, ReadonlyPMMR};
use crate::core::BlockHeader;
use crate::core::hash::Hash;
use crate::core::pmmr;
use crate::core::pmmr::{Backend, ReadablePMMR, ReadonlyPMMR};
use crate::ser::{
self, Error as SerError, PMMRIndexHashable, PMMRable, Readable, Reader, Writeable, Writer,
Error as SerError, PMMRIndexHashable, PMMRable, Readable, Reader, Writeable, Writer,
};
use croaring::Bitmap;
use log::error;
@ -602,6 +602,12 @@ impl<T: Readable> Readable for Segment<T> {
hash_pos.push(pos - 1);
}
let mut hashes = Vec::<Hash>::with_capacity(n_hashes);
for _ in 0..n_hashes {
let hash: Hash = Readable::read(reader)?;
hashes.push(hash);
}
let n_leaves = reader.read_u64()? as usize;
// Also check leaves count for safety
if n_leaves > MAX_LEAVES_PER_SEGMENT {
@ -623,12 +629,6 @@ impl<T: Readable> Readable for Segment<T> {
leaf_pos.push(pos - 1);
}
let mut hashes = Vec::<Hash>::with_capacity(n_hashes);
for _ in 0..n_hashes {
let hash: Hash = Readable::read(reader)?;
hashes.push(hash);
}
let mut leaf_data = Vec::<T>::with_capacity(n_leaves);
for _ in 0..n_leaves {
leaf_data.push(Readable::read(reader)?);