|
1 | 1 | use anyhow::{anyhow, bail}; |
| 2 | +use serde::Serialize; |
| 3 | +use serde_json::Value; |
2 | 4 | use ssz::Decode; |
3 | 5 |
|
4 | 6 | use super::{ |
5 | | - extension_types::Extensions, |
| 7 | + extension_types::PingExtensionType, |
6 | 8 | extensions::{ |
7 | 9 | type_0::ClientInfoRadiusCapabilities, type_1::BasicRadius, type_2::HistoryRadius, |
8 | 10 | type_65535::PingError, |
9 | 11 | }, |
10 | 12 | }; |
11 | 13 | use crate::{types::portal_wire::CustomPayload, utils::bytes::hex_encode}; |
12 | 14 |
|
13 | | -#[derive(Debug, Clone)] |
14 | | -pub enum DecodedExtension { |
| 15 | +#[derive(Debug, Clone, Serialize, PartialEq, Eq)] |
| 16 | +#[serde(untagged)] |
| 17 | +pub enum PingExtension { |
15 | 18 | Capabilities(ClientInfoRadiusCapabilities), |
16 | 19 | BasicRadius(BasicRadius), |
17 | 20 | HistoryRadius(HistoryRadius), |
18 | 21 | Error(PingError), |
19 | 22 | } |
20 | 23 |
|
21 | | -impl From<DecodedExtension> for Extensions { |
22 | | - fn from(value: DecodedExtension) -> Self { |
| 24 | +impl From<PingExtension> for PingExtensionType { |
| 25 | + fn from(value: PingExtension) -> Self { |
23 | 26 | match value { |
24 | | - DecodedExtension::Capabilities(_) => Extensions::Capabilities, |
25 | | - DecodedExtension::BasicRadius(_) => Extensions::BasicRadius, |
26 | | - DecodedExtension::HistoryRadius(_) => Extensions::HistoryRadius, |
27 | | - DecodedExtension::Error(_) => Extensions::Error, |
| 27 | + PingExtension::Capabilities(_) => PingExtensionType::Capabilities, |
| 28 | + PingExtension::BasicRadius(_) => PingExtensionType::BasicRadius, |
| 29 | + PingExtension::HistoryRadius(_) => PingExtensionType::HistoryRadius, |
| 30 | + PingExtension::Error(_) => PingExtensionType::Error, |
28 | 31 | } |
29 | 32 | } |
30 | 33 | } |
31 | 34 |
|
32 | | -impl DecodedExtension { |
33 | | - pub fn decode_extension(payload_type: u16, payload: CustomPayload) -> anyhow::Result<Self> { |
34 | | - let Ok(extension_type) = Extensions::try_from(payload_type) else { |
35 | | - bail!("Failed to decode extension type {payload_type}"); |
| 35 | +impl From<PingExtension> for CustomPayload { |
| 36 | + fn from(value: PingExtension) -> Self { |
| 37 | + match value { |
| 38 | + PingExtension::Capabilities(capabilities) => CustomPayload::from(capabilities), |
| 39 | + PingExtension::BasicRadius(basic_radius) => CustomPayload::from(basic_radius), |
| 40 | + PingExtension::HistoryRadius(history_radius) => CustomPayload::from(history_radius), |
| 41 | + PingExtension::Error(error) => CustomPayload::from(error), |
| 42 | + } |
| 43 | + } |
| 44 | +} |
| 45 | + |
| 46 | +impl PingExtension { |
| 47 | + pub fn decode_ssz( |
| 48 | + extension_type: PingExtensionType, |
| 49 | + payload: CustomPayload, |
| 50 | + ) -> anyhow::Result<Self> { |
| 51 | + let ping_extension = match extension_type { |
| 52 | + PingExtensionType::Capabilities => { |
| 53 | + ClientInfoRadiusCapabilities::from_ssz_bytes(&payload.payload) |
| 54 | + .map(PingExtension::Capabilities) |
| 55 | + } |
| 56 | + PingExtensionType::BasicRadius => { |
| 57 | + BasicRadius::from_ssz_bytes(&payload.payload).map(PingExtension::BasicRadius) |
| 58 | + } |
| 59 | + PingExtensionType::HistoryRadius => { |
| 60 | + HistoryRadius::from_ssz_bytes(&payload.payload).map(PingExtension::HistoryRadius) |
| 61 | + } |
| 62 | + PingExtensionType::Error => { |
| 63 | + PingError::from_ssz_bytes(&payload.payload).map(PingExtension::Error) |
| 64 | + } |
| 65 | + PingExtensionType::NonSupportedExtension(non_supported_extension) => { |
| 66 | + bail!("Non supported extension type: {non_supported_extension}") |
| 67 | + } |
36 | 68 | }; |
| 69 | + ping_extension.map_err(|err| { |
| 70 | + anyhow!( |
| 71 | + "Failed to decode ping extension {extension_type}: {err:?}, payload: {:?}", |
| 72 | + hex_encode(&*payload.payload) |
| 73 | + ) |
| 74 | + }) |
| 75 | + } |
37 | 76 |
|
38 | | - match extension_type { |
39 | | - Extensions::Capabilities => { |
40 | | - let capabilities = ClientInfoRadiusCapabilities::from_ssz_bytes(&payload.payload) |
41 | | - .map_err(|err| { |
42 | | - anyhow!( |
43 | | - "Failed to decode ClientInfoRadiusCapabilities: {err:?}, payload: {:?}", |
44 | | - hex_encode(&*payload.payload) |
45 | | - ) |
46 | | - })?; |
47 | | - Ok(DecodedExtension::Capabilities(capabilities)) |
| 77 | + pub fn decode_json(extension_type: PingExtensionType, payload: Value) -> anyhow::Result<Self> { |
| 78 | + let ping_extension = match extension_type { |
| 79 | + PingExtensionType::Capabilities => { |
| 80 | + serde_json::from_value(payload).map(PingExtension::Capabilities) |
48 | 81 | } |
49 | | - Extensions::BasicRadius => { |
50 | | - let basic_radius = |
51 | | - BasicRadius::from_ssz_bytes(&payload.payload).map_err(|err| { |
52 | | - anyhow!( |
53 | | - "Failed to decode BasicRadius: {err:?}, payload: {:?}", |
54 | | - hex_encode(&*payload.payload) |
55 | | - ) |
56 | | - })?; |
57 | | - Ok(DecodedExtension::BasicRadius(basic_radius)) |
| 82 | + PingExtensionType::BasicRadius => { |
| 83 | + serde_json::from_value(payload).map(PingExtension::BasicRadius) |
58 | 84 | } |
59 | | - Extensions::HistoryRadius => { |
60 | | - let history_radius = |
61 | | - HistoryRadius::from_ssz_bytes(&payload.payload).map_err(|err| { |
62 | | - anyhow!( |
63 | | - "Failed to decode HistoryRadius: {err:?}, payload: {:?}", |
64 | | - hex_encode(&*payload.payload) |
65 | | - ) |
66 | | - })?; |
67 | | - Ok(DecodedExtension::HistoryRadius(history_radius)) |
| 85 | + PingExtensionType::HistoryRadius => { |
| 86 | + serde_json::from_value(payload).map(PingExtension::HistoryRadius) |
68 | 87 | } |
69 | | - Extensions::Error => { |
70 | | - let error = PingError::from_ssz_bytes(&payload.payload).map_err(|err| { |
71 | | - anyhow!( |
72 | | - "Failed to decode PingError: {err:?}, payload: {:?}", |
73 | | - hex_encode(&*payload.payload) |
74 | | - ) |
75 | | - })?; |
76 | | - Ok(DecodedExtension::Error(error)) |
| 88 | + PingExtensionType::Error => serde_json::from_value(payload).map(PingExtension::Error), |
| 89 | + PingExtensionType::NonSupportedExtension(non_supported_extension) => { |
| 90 | + bail!("Non supported extension type: {non_supported_extension}") |
77 | 91 | } |
| 92 | + }; |
| 93 | + ping_extension |
| 94 | + .map_err(|err| anyhow!("Failed to decode ping extension {extension_type}: {err:?} ")) |
| 95 | + } |
| 96 | + |
| 97 | + pub fn ping_extension_type(&self) -> PingExtensionType { |
| 98 | + match self { |
| 99 | + PingExtension::Capabilities(_) => PingExtensionType::Capabilities, |
| 100 | + PingExtension::BasicRadius(_) => PingExtensionType::BasicRadius, |
| 101 | + PingExtension::HistoryRadius(_) => PingExtensionType::HistoryRadius, |
| 102 | + PingExtension::Error(_) => PingExtensionType::Error, |
78 | 103 | } |
79 | 104 | } |
80 | 105 | } |
0 commit comments