jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: replace BytesMut with alloy_rlp::encode (#7047)

Browse Source 
Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
This commit is contained in:
Håvard Anda Estensen
2024-03-08 14:56:28 +01:00
committed by GitHub
parent 9569692d47
commit 7fa35042dd
6 changed files with 21 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/net/discv4/src/config.rs
View File

@ -6,10 +6,7 @@
use alloy_rlp::Encodable;
use reth_net_common::ban_list::BanList;
use reth_net_nat::{NatResolver, ResolveNatInterval};
use reth_primitives::{
bytes::{Bytes, BytesMut},
NodeRecord,
};
use reth_primitives::{bytes::Bytes, NodeRecord};
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use std::{
@ -80,9 +77,7 @@ impl Discv4Config {
/// Add another key value pair to include in the ENR
pub fn add_eip868_pair(&mut self, key: impl Into<Vec<u8>>, value: impl Encodable) -> &mut Self {
let mut buf = BytesMut::new();
value.encode(&mut buf);
self.add_eip868_rlp_pair(key, buf.freeze())
self.add_eip868_rlp_pair(key, Bytes::from(alloy_rlp::encode(&value)))
}
/// Add another key value pair to include in the ENR
@ -237,9 +232,7 @@ impl Discv4ConfigBuilder {
/// Add another key value pair to include in the ENR
pub fn add_eip868_pair(&mut self, key: impl Into<Vec<u8>>, value: impl Encodable) -> &mut Self {
let mut buf = BytesMut::new();
value.encode(&mut buf);
self.add_eip868_rlp_pair(key, buf.freeze())
self.add_eip868_rlp_pair(key, Bytes::from(alloy_rlp::encode(&value)))
}
/// Add another key value pair to include in the ENR

9
crates/net/discv4/src/lib.rs
View File

@ -40,10 +40,7 @@ use discv5::{
use enr::Enr;
use parking_lot::Mutex;
use proto::{EnrRequest, EnrResponse, EnrWrapper};
use reth_primitives::{
bytes::{Bytes, BytesMut},
hex, ForkId, PeerId, B256,
};
use reth_primitives::{bytes::Bytes, hex, ForkId, PeerId, B256};
use secp256k1::SecretKey;
use std::{
cell::RefCell,
@ -377,9 +374,7 @@ impl Discv4 {
///
/// If the key already exists, this will update it.
pub fn set_eip868_rlp(&self, key: Vec<u8>, value: impl alloy_rlp::Encodable) {
let mut buf = BytesMut::new();
value.encode(&mut buf);
self.set_eip868_rlp_pair(key, buf.freeze())
self.set_eip868_rlp_pair(key, Bytes::from(alloy_rlp::encode(&value)))
}
#[inline]

30
crates/net/discv4/src/proto.rs
View File

@ -565,10 +565,7 @@ mod tests {
udp_port: rng.gen(),
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = NodeEndpoint::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeEndpoint::decode(&mut alloy_rlp::encode(msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}
@ -585,10 +582,7 @@ mod tests {
udp_port: rng.gen(),
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = NodeEndpoint::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeEndpoint::decode(&mut alloy_rlp::encode(msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}
@ -606,10 +600,7 @@ mod tests {
enr_sq: None,
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = Ping::decode(&mut buf.as_ref()).unwrap();
let decoded = Ping::decode(&mut alloy_rlp::encode(&msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}
@ -627,10 +618,7 @@ mod tests {
enr_sq: Some(rng.gen()),
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = Ping::decode(&mut buf.as_ref()).unwrap();
let decoded = Ping::decode(&mut alloy_rlp::encode(&msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}
@ -648,10 +636,7 @@ mod tests {
enr_sq: None,
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = Pong::decode(&mut buf.as_ref()).unwrap();
let decoded = Pong::decode(&mut alloy_rlp::encode(&msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}
@ -669,10 +654,7 @@ mod tests {
enr_sq: Some(rng.gen()),
};
let mut buf = BytesMut::new();
msg.encode(&mut buf);
let decoded = Pong::decode(&mut buf.as_ref()).unwrap();
let decoded = Pong::decode(&mut alloy_rlp::encode(&msg).as_slice()).unwrap();
assert_eq!(msg, decoded);
}
}

7
crates/net/eth-wire/src/p2pstream.rs
View File

@ -185,13 +185,14 @@ where
&mut self,
reason: DisconnectReason,
) -> Result<(), P2PStreamError> {
let mut buf = BytesMut::new();
P2PMessage::Disconnect(reason).encode(&mut buf);
trace!(
%reason,
"Sending disconnect message during the handshake",
);
self.inner.send(buf.freeze()).await.map_err(P2PStreamError::Io)
self.inner
.send(Bytes::from(alloy_rlp::encode(P2PMessage::Disconnect(reason))))
.await
.map_err(P2PStreamError::Io)
}
}

13
crates/primitives/src/net.rs
View File

@ -74,8 +74,7 @@ mod tests {
};
use super::*;
use alloy_rlp::{Decodable, Encodable};
use bytes::BytesMut;
use alloy_rlp::Decodable;
use rand::{thread_rng, Rng, RngCore};
use reth_rpc_types::PeerId;
@ -126,10 +125,7 @@ mod tests {
id: rng.gen(),
};
let mut buf = BytesMut::new();
record.encode(&mut buf);
let decoded = NodeRecord::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeRecord::decode(&mut alloy_rlp::encode(record).as_slice()).unwrap();
assert_eq!(record, decoded);
}
}
@ -147,10 +143,7 @@ mod tests {
id: rng.gen(),
};
let mut buf = BytesMut::new();
record.encode(&mut buf);
let decoded = NodeRecord::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeRecord::decode(&mut alloy_rlp::encode(record).as_slice()).unwrap();
assert_eq!(record, decoded);
}
}

13
crates/rpc/rpc-types/src/net.rs
View File

@ -168,8 +168,7 @@ impl FromStr for NodeRecord {
#[cfg(test)]
mod tests {
use super::*;
use alloy_rlp::{Decodable, Encodable};
use bytes::BytesMut;
use alloy_rlp::Decodable;
use rand::{thread_rng, Rng, RngCore};
#[test]
@ -219,10 +218,7 @@ mod tests {
id: rng.gen(),
};
let mut buf = BytesMut::new();
record.encode(&mut buf);
let decoded = NodeRecord::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeRecord::decode(&mut alloy_rlp::encode(record).as_slice()).unwrap();
assert_eq!(record, decoded);
}
}
@ -240,10 +236,7 @@ mod tests {
id: rng.gen(),
};
let mut buf = BytesMut::new();
record.encode(&mut buf);
let decoded = NodeRecord::decode(&mut buf.as_ref()).unwrap();
let decoded = NodeRecord::decode(&mut alloy_rlp::encode(record).as_slice()).unwrap();
assert_eq!(record, decoded);
}
}