LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ethers-core): Deserialize a Filter request with `topics == null` (#1604) 

* fix(ethers-core): Deserialize a Filter request with `topics == null`

* Update ethers-core/src/types/filter.rs

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>

Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
This commit is contained in:
Nicolas Gotchac 2022-08-17 23:14:42 +02:00 committed by GitHub
parent 4655c44481
commit 1bb8fae4c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ethers-core/src/types/filter.rs
View File

@ -429,7 +429,7 @@ impl<'de> Deserialize<'de> for Filter {
let mut to_block: Option<Option<BlockNumber>> = None; let mut to_block: Option<Option<BlockNumber>> = None;
let mut block_hash: Option<Option<H256>> = None; let mut block_hash: Option<Option<H256>> = None;
let mut address: Option<Option<ValueOrArray<Address>>> = None; let mut address: Option<Option<ValueOrArray<Address>>> = None;
let mut topics: Option<Vec<Option<Topic>>> = None; let mut topics: Option<Option<Vec<Option<Topic>>>> = None;
while let Some(key) = map.next_key::<String>()? { while let Some(key) = map.next_key::<String>()? {
match key.as_str() { match key.as_str() {
@ -492,7 +492,7 @@ impl<'de> Deserialize<'de> for Filter {
let to_block = to_block.unwrap_or_default(); let to_block = to_block.unwrap_or_default();
let block_hash = block_hash.unwrap_or_default(); let block_hash = block_hash.unwrap_or_default();
let address = address.unwrap_or_default(); let address = address.unwrap_or_default();
let topics_vec = topics.unwrap_or_default(); let topics_vec = topics.flatten().unwrap_or_default();
// maximum allowed filter len // maximum allowed filter len
if topics_vec.len() > 4 { if topics_vec.len() > 4 {
@ -1172,4 +1172,29 @@ mod tests {
} }
); );
} }
#[test]
fn can_convert_to_ethers_filter_with_null_fields() {
let json = json!(
{
"fromBlock": "0x429d3b",
"toBlock": "0x429d3b",
"address": null,
"topics": null
}
);
let filter: Filter = serde_json::from_value(json).unwrap();
assert_eq!(
filter,
Filter {
block_option: FilterBlockOption::Range {
from_block: Some(4365627u64.into()),
to_block: Some(4365627u64.into()),
},
address: None,
topics: [None, None, None, None,],
}
);
}
} }