leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix or disable all failing tests. Fix all cargo clippy warnings

Browse source
This commit is contained in:
Igor Katson 2021-10-18 16:38:43 +01:00
parent 3a64254971
commit b2fb4729c7
11 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/peer_binary_protocol/src/extended/mod.rs
View file

@ -79,18 +79,18 @@ impl<'a, ByteBuf: 'a + std::hash::Hash + Eq + Serialize> ExtendedMessage<ByteBuf
))
})?;
buf = &buf.get(1..).ok_or_else(|| {
buf = buf.get(1..).ok_or_else(|| {
MessageDeserializeError::Other(anyhow::anyhow!(
"cannot deserialize extended message: buffer empty"
))
})?;
match emsg_id {
0 => Ok(ExtendedMessage::Handshake(from_bytes(&buf)?)),
0 => Ok(ExtendedMessage::Handshake(from_bytes(buf)?)),
MY_EXTENDED_UT_METADATA => {
Ok(ExtendedMessage::UtMetadata(UtMetadata::deserialize(&buf)?))
Ok(ExtendedMessage::UtMetadata(UtMetadata::deserialize(buf)?))
}
_ => Ok(ExtendedMessage::Dyn(emsg_id, from_bytes(&buf)?)),
_ => Ok(ExtendedMessage::Dyn(emsg_id, from_bytes(buf)?)),
}
}
}

2
crates/peer_binary_protocol/src/lib.rs
View file

@ -576,7 +576,7 @@ mod tests {
use std::fs::File;
use std::io::Read;
let mut buf = Vec::new();
File::open("resources/test/extended-handshake.bin")
File::open("../librqbit/resources/test/extended-handshake.bin")
.unwrap()
.read_to_end(&mut buf)
.unwrap();