Skip to content

fix: fix hazmat assertion error when using fsm io #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

fix: fix hazmat assertion error when using fsm io #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ smallvec = "1"
bytes = { version = "1" }
futures-lite = { version = "2.3", optional = true }
self_cell = { version = "1" }
iroh-io = { version = "0.6.0", default-features = false, optional = true }
iroh-io = { version = "0.6.2", default-features = false, optional = true }
positioned-io = { version = "0.3.1", default-features = false }
genawaiter = { version = "0.99.1", features = ["futures03"], optional = true }
tokio = { version = "1", features = ["sync"], default-features = false, optional = true }
Expand All @@ -42,7 +42,7 @@ proptest = "1.0.0"
rand = "0.8.5"
criterion = "0.4.0"
tempfile = "3.6.0"
iroh-io = { version = "0.6.0" }
iroh-io = { version = "0.6.2" }
warp = "0.3.5"
proc-macro2 = "1.0.66"
test-strategy = "0.3.1"
Expand Down
16 changes: 9 additions & 7 deletions src/io/fsm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ impl<R: AsyncStreamReader> ResponseDecoder<R> {
let this = &mut self.0;
let data = this
.encoded
.read_bytes(size)
.read_bytes_exact(size)
.await
.map_err(|e| DecodeError::maybe_leaf_not_found(e, start_chunk))?;
let leaf_hash = this.stack.pop().unwrap();
Expand Down Expand Up @@ -482,7 +482,7 @@ where
start_chunk, size, ..
} => {
let start = start_chunk.to_bytes();
let bytes = data.read_at(start, size).await?;
let bytes = data.read_exact_at(start, size).await?;
encoded
.write_bytes(bytes)
.await
Expand Down Expand Up @@ -555,7 +555,7 @@ where
} => {
let expected = stack.pop().unwrap();
let start = start_chunk.to_bytes();
let bytes = data.read_at(start, size).await?;
let bytes = data.read_exact_at(start, size).await?;
let (actual, to_write) = if !ranges.is_all() {
// we need to encode just a part of the data
//
Expand Down Expand Up @@ -669,7 +669,7 @@ async fn outboard_impl(
start_chunk,
..
} => {
let buf = data.read_bytes(size).await?;
let buf = data.read_bytes_exact(size).await?;
let hash = hash_subtree(start_chunk.0, &buf, is_root);
stack.push(hash);
}
Expand Down Expand Up @@ -722,7 +722,7 @@ async fn outboard_post_order_impl(
start_chunk,
..
} => {
let buf = data.read_bytes(size).await?;
let buf = data.read_bytes_exact(size).await?;
let hash = hash_subtree(start_chunk.0, &buf, is_root);
stack.push(hash);
}
Expand Down Expand Up @@ -802,7 +802,9 @@ mod validate {
if tree.blocks() == 1 {
// special case for a tree that fits in one block / chunk group
let mut data = data;
let data = data.read_at(0, tree.size().try_into().unwrap()).await?;
let data = data
.read_exact_at(0, tree.size().try_into().unwrap())
.await?;
let actual = hash_subtree(0, &data, true);
if actual == outboard.root() {
co.yield_(Ok(ChunkNum(0)..tree.chunks())).await;
Expand Down Expand Up @@ -831,7 +833,7 @@ mod validate {
is_root: bool,
) -> io::Result<()> {
let len = (range.end - range.start).try_into().unwrap();
let data = self.data.read_at(range.start, len).await?;
let data = self.data.read_exact_at(range.start, len).await?;
// is_root is always false because the case of a single chunk group is handled before calling this function
let actual = hash_subtree(ChunkNum::full_chunks(range.start).0, &data, is_root);
if &actual == hash {
Expand Down
Loading