Skip to content

Commit da64395

Browse files
committed
primitives - balances_map - remove custom serialization and leave the ValidatorId to be checksummed
1 parent 8efc08c commit da64395

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

primitives/src/balances_map.rs

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::collections::BTreeMap;
33
use crate::{BigNum, ValidatorId};
44
use std::collections::btree_map::{Entry, Iter, Values};
55

6-
use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
6+
use serde::{Deserialize, Serialize};
77
use std::iter::FromIterator;
88
use std::ops::Index;
99

10-
#[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq)]
10+
#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
1111
#[serde(transparent)]
1212
pub struct BalancesMap(BTreeMap<ValidatorId, BigNum>);
1313

@@ -50,20 +50,6 @@ impl FromIterator<(ValidatorId, BigNum)> for BalancesMap {
5050
}
5151
}
5252

53-
impl Serialize for BalancesMap {
54-
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
55-
where
56-
S: Serializer,
57-
{
58-
let mut map = serializer.serialize_map(Some(self.0.len()))?;
59-
60-
for (key, big_num) in self.0.iter() {
61-
map.serialize_entry(&key.to_hex_prefix_string(), big_num)?;
62-
}
63-
map.end()
64-
}
65-
}
66-
6753
#[cfg(test)]
6854
mod test {
6955
use super::*;
@@ -81,7 +67,7 @@ mod test {
8167

8268
let actual_json = serde_json::to_string(&balances_map).expect("Should serialize it");
8369
// should be all lowercase!
84-
let expected_json = r#"{"0xc91763d7f14ac5c5ddfbcd012e0d2a61ab9bded3":"100","0xce07cbb7e054514d590a0262c93070d838bfba2e":"50"}"#;
70+
let expected_json = r#"{"0xC91763D7F14ac5c5dDfBCD012e0D2A61ab9bDED3":"100","0xce07CbB7e054514D590a0262C93070D838bFBA2e":"50"}"#;
8571

8672
assert_eq!(expected_json, actual_json);
8773

0 commit comments

Comments
 (0)