From 7e10443a54da7bbb02ca3d6d7d16dd6fed3417c8 Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Mon, 12 Aug 2024 09:27:21 -0700 Subject: [PATCH 1/3] rpc-types-eth: add From u32 and U64 for PeerCount --- crates/rpc-types-eth/src/syncing.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/crates/rpc-types-eth/src/syncing.rs b/crates/rpc-types-eth/src/syncing.rs index 68bfd1d0f68..e84e70905c9 100644 --- a/crates/rpc-types-eth/src/syncing.rs +++ b/crates/rpc-types-eth/src/syncing.rs @@ -57,6 +57,18 @@ pub enum PeerCount { Hex(U64), } +impl From for PeerCount { + fn from(number: u32) -> Self { + Self::Number(number) + } +} + +impl From for PeerCount { + fn from(hex: U64) -> Self { + Self::Hex(hex) + } +} + /// Peer connection information #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub struct PeerInfo { From f5aef49f1ee091b906614d26d74254b14b952fea Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Mon, 12 Aug 2024 09:35:01 -0700 Subject: [PATCH 2/3] rm PeerCount --- crates/rpc-types-eth/src/syncing.rs | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/crates/rpc-types-eth/src/syncing.rs b/crates/rpc-types-eth/src/syncing.rs index e84e70905c9..7f9fa8ef669 100644 --- a/crates/rpc-types-eth/src/syncing.rs +++ b/crates/rpc-types-eth/src/syncing.rs @@ -47,28 +47,6 @@ pub struct Peers { pub peers: Vec, } -/// Number of peers connected to. -#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] -#[serde(untagged)] -pub enum PeerCount { - /// Peer count as integer - Number(u32), - /// Peer count as hex - Hex(U64), -} - -impl From for PeerCount { - fn from(number: u32) -> Self { - Self::Number(number) - } -} - -impl From for PeerCount { - fn from(hex: U64) -> Self { - Self::Hex(hex) - } -} - /// Peer connection information #[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub struct PeerInfo { From bf9609883661cd5e0f13bbf7c66d2982d58074d6 Mon Sep 17 00:00:00 2001 From: Thomas Coratger Date: Mon, 12 Aug 2024 09:39:59 -0700 Subject: [PATCH 3/3] fix clippy --- crates/rpc-types-eth/src/syncing.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/rpc-types-eth/src/syncing.rs b/crates/rpc-types-eth/src/syncing.rs index 7f9fa8ef669..f2fda6fdf17 100644 --- a/crates/rpc-types-eth/src/syncing.rs +++ b/crates/rpc-types-eth/src/syncing.rs @@ -1,4 +1,4 @@ -use alloy_primitives::{B512, U256, U64}; +use alloy_primitives::{B512, U256}; use serde::{Deserialize, Deserializer, Serialize, Serializer}; use std::collections::BTreeMap;