github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-26 23:58:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unsafe from impl Compact for ClientVersion (#11318)

Browse Source 
Co-authored-by: Emilia Hane <elsaemiliaevahane@gmail.com>
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
This commit is contained in:
0xriazaka.eth
2024-10-17 21:28:13 +01:00
committed by GitHub
parent a6c8bda029
commit 8eb5d4f047
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/storage/codecs/src/lib.rs
View File

@@ -78,6 +78,21 @@ pub trait Compact: Sized {
}
}
impl Compact for alloc::string::String {
fn to_compact<B>(&self, buf: &mut B) -> usize
where
B: bytes::BufMut + AsMut<[u8]>,
{
self.as_bytes().to_compact(buf)
}
fn from_compact(buf: &[u8], len: usize) -> (Self, &[u8]) {
let (vec, buf) = Vec::<u8>::from_compact(buf, len);
let string = Self::from_utf8(vec).unwrap(); // Safe conversion
(string, buf)
}
}
impl<T: Compact> Compact for &T {
fn to_compact<B>(&self, buf: &mut B) -> usize
where

18
crates/storage/db-models/src/client_version.rs
View File

@@ -28,20 +28,16 @@ impl Compact for ClientVersion {
where
B: bytes::BufMut + AsMut<[u8]>,
{
self.version.as_bytes().to_compact(buf);
self.git_sha.as_bytes().to_compact(buf);
self.build_timestamp.as_bytes().to_compact(buf)
self.version.to_compact(buf);
self.git_sha.to_compact(buf);
self.build_timestamp.to_compact(buf)
}
fn from_compact(buf: &[u8], len: usize) -> (Self, &[u8]) {
let (version, buf) = Vec::<u8>::from_compact(buf, len);
let (git_sha, buf) = Vec::<u8>::from_compact(buf, len);
let (build_timestamp, buf) = Vec::<u8>::from_compact(buf, len);
let client_version = Self {
version: unsafe { String::from_utf8_unchecked(version) },
git_sha: unsafe { String::from_utf8_unchecked(git_sha) },
build_timestamp: unsafe { String::from_utf8_unchecked(build_timestamp) },
};
let (version, buf) = String::from_compact(buf, len);
let (git_sha, buf) = String::from_compact(buf, len);
let (build_timestamp, buf) = String::from_compact(buf, len);
let client_version = Self { version, git_sha, build_timestamp };
(client_version, buf)
}
}