Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ledger object models #58

Merged
merged 8 commits into from
Apr 6, 2023
Merged

Add ledger object models #58

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83a03fa
revise serde_with_tag
LimpidCrypto Mar 17, 2023
58a39bc
add ledger object models
LimpidCrypto Mar 17, 2023
09c24bb
make SignerEntry fields public
LimpidCrypto Mar 17, 2023
f469a38
Merge branch 'develop' into add-ledger-object-models
LimpidCrypto Mar 23, 2023
47ff89b
implement new Amount/Currency models
LimpidCrypto Mar 23, 2023
4769803
handle unwraps
LimpidCrypto Mar 27, 2023
2b689ef
handle unwraps
LimpidCrypto Mar 27, 2023
e6446ee
Merge branch 'develop' into add-ledger-object-models
LimpidCrypto Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 104 additions & 36 deletions src/_serde/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ use fnv::FnvHasher;

pub type HashMap<K, V> = hashbrown::HashMap<K, V, BuildHasherDefault<FnvHasher>>;

pub mod txn_flags {
pub(crate) mod txn_flags {
use core::fmt::Debug;

use alloc::vec::Vec;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use strum::IntoEnumIterator;

pub fn serialize<F, S>(flags: &Option<Vec<F>>, s: S) -> Result<S::Ok, S::Error>
where
F: Serialize,
S: Serializer,
where
F: Serialize,
S: Serializer,
{
if let Some(f) = flags {
let flags_as_value = serde_json::to_value(f).unwrap();
LimpidCrypto marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -28,9 +28,9 @@ pub mod txn_flags {
}

pub fn deserialize<'de, F, D>(d: D) -> Result<Option<Vec<F>>, D::Error>
where
F: Serialize + IntoEnumIterator + Debug,
D: Deserializer<'de>,
where
F: Serialize + IntoEnumIterator + Debug,
D: Deserializer<'de>,
{
let flags_u32 = u32::deserialize(d)?;

Expand All @@ -54,15 +54,63 @@ pub mod txn_flags {
}
}

pub(crate) mod lgr_obj_flags {
use core::fmt::Debug;

use alloc::vec::Vec;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use strum::IntoEnumIterator;

pub fn serialize<F, S>(flags: &Vec<F>, s: S) -> Result<S::Ok, S::Error>
where
F: Serialize,
S: Serializer,
{
if !flags.is_empty() {
let flags_as_value = serde_json::to_value(flags).unwrap();
let flag_num_vec: Vec<u32> = serde_json::from_value(flags_as_value).unwrap();
LimpidCrypto marked this conversation as resolved.
Show resolved Hide resolved

s.serialize_u32(flag_num_vec.iter().sum())
} else {
s.serialize_u32(0)
}
}

pub fn deserialize<'de, F, D>(d: D) -> Result<Vec<F>, D::Error>
where
F: Serialize + IntoEnumIterator + Debug,
D: Deserializer<'de>,
{
let flags_u32 = u32::deserialize(d)?;
if flags_u32 != 0 {
let mut flags_vec = Vec::new();
for flag in F::iter() {
let check_flag: u32 = serde_json::to_string(&flag)
.unwrap()
.as_str()
.parse::<u32>()
.unwrap();
LimpidCrypto marked this conversation as resolved.
Show resolved Hide resolved
if check_flag & flags_u32 == check_flag {
flags_vec.push(flag);
}
}

Ok(flags_vec)
} else {
Ok(Vec::new())
}
}
}

/// Used for tagged variants in an `untagged` enum
pub mod currency_xrp {
pub(crate) mod currency_xrp {
use super::HashMap;
use serde::de::Error;
use serde::{ser::SerializeMap, Deserialize};

pub fn serialize<S>(serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
where
S: serde::Serializer,
{
let xrp_currency = [("currency", "XRP")];
let mut map = serializer.serialize_map(Some(xrp_currency.len()))?;
Expand All @@ -73,8 +121,8 @@ pub mod currency_xrp {
}

pub fn deserialize<'de, D>(deserializer: D) -> Result<(), D::Error>
where
D: serde::Deserializer<'de>,
where
D: serde::Deserializer<'de>,
{
let xrp_currency: HashMap<&str, &str> = HashMap::deserialize(deserializer)?;

Expand All @@ -97,23 +145,15 @@ macro_rules! serde_with_tag {
pub struct $name:ident<$lt:lifetime> {
$(
$(#[$doc:meta])*
$field:ident : $ty:ty,
pub $field:ident: $ty:ty,
)*
}
) => {
$(#[$attr])*
pub struct $name<$lt> {
$(
$(#[$doc])*
$field: $ty,
)*
}

#[derive(Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct Helper<$lt> {
$(
$field: $ty,
pub $field: $ty,
)*
}

Expand All @@ -122,6 +162,15 @@ macro_rules! serde_with_tag {
where
S: ::serde::Serializer
{
#[derive(Serialize)]
#[serde(rename_all = "PascalCase")]
#[skip_serializing_none]
struct Helper<$lt> {
$(
$field: $ty,
)*
}

let helper = Helper {
$(
$field: self.$field.clone(),
Expand All @@ -141,12 +190,21 @@ macro_rules! serde_with_tag {
where
D: serde::Deserializer<'de>,
{
let hash_map: HashMap<&$lt str, Helper<$lt>> = HashMap::deserialize(deserializer)?;
#[derive(Deserialize)]
#[serde(rename_all = "PascalCase")]
#[skip_serializing_none]
struct Helper<$lt> {
$(
$field: $ty,
)*
}

let hash_map: $crate::_serde::HashMap<&$lt str, Helper<$lt>> = $crate::_serde::HashMap::deserialize(deserializer)?;
let helper = hash_map.get(stringify!($name)).unwrap();
LimpidCrypto marked this conversation as resolved.
Show resolved Hide resolved

Ok(Self {
$(
$field: helper.$field.into(),
$field: helper.$field.clone().into(),
)*
})
}
Expand All @@ -157,23 +215,15 @@ macro_rules! serde_with_tag {
pub struct $name:ident {
$(
$(#[$doc:meta])*
$field:ident : $ty:ty,
pub $field:ident: $ty:ty,
)*
}
) => {
$(#[$attr])*
pub struct $name {
$(
$(#[$doc])*
$field: $ty,
)*
}

#[derive(Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct Helper {
$(
$field: $ty,
pub $field: $ty,
)*
}

Expand All @@ -182,6 +232,15 @@ macro_rules! serde_with_tag {
where
S: ::serde::Serializer
{
#[derive(Serialize)]
#[serde(rename_all = "PascalCase")]
#[skip_serializing_none]
struct Helper {
$(
$field: $ty,
)*
}

let helper = Helper {
$(
$field: self.$field.clone(),
Expand All @@ -201,7 +260,16 @@ macro_rules! serde_with_tag {
where
D: serde::Deserializer<'de>,
{
let hash_map: HashMap<&'de str, Helper> = HashMap::deserialize(deserializer)?;
#[derive(Deserialize)]
#[serde(rename_all = "PascalCase")]
#[skip_serializing_none]
struct Helper {
$(
$field: $ty,
)*
}

let hash_map: $crate::_serde::HashMap<&'de str, Helper> = $crate::_serde::HashMap::deserialize(deserializer)?;
let helper = hash_map.get(stringify!($name)).unwrap();
LimpidCrypto marked this conversation as resolved.
Show resolved Hide resolved

Ok(Self {
Expand All @@ -212,4 +280,4 @@ macro_rules! serde_with_tag {
}
}
};
}
}
2 changes: 2 additions & 0 deletions src/models/ledger/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pub mod objects;
pub use objects::*;
Loading