grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Type annotation for next_key() matching of json filter options (#11192)

Browse Source 
* type annotation for next_key matching of json filter options

* rpc tests for pending transactions

* mention git submodules in the readme
This commit is contained in:
Fabio Lama
2019-10-23 14:20:47 +02:00
committed by Marek Kotewicz
parent 834585d61b
commit acf7c48d7e
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ethcore/src/miner/filter_options.rs
View File

@@ -160,8 +160,8 @@ impl<'de> Deserialize<'de> for FilterOptions {
M: MapAccess<'de>,
{
let mut filter = FilterOptions::default();
while let Some(key) = map.next_key()? {
match key {
while let Some(key) = map.next_key::<String>()? {
match key.as_str() {
"from" => {
filter.from = map.validate_from()?;
},
@@ -221,8 +221,8 @@ impl<'de> Deserialize<'de> for FilterOptions {
let mut counter = 0;
let mut f_op = Wrapper::O(FilterOperator::Any);
while let Some(key) = map.next_key()? {
match key {
while let Some(key) = map.next_key::<String>()? {
match key.as_str() {
"eq" => f_op = W::O(FilterOperator::Eq(map.next_value()?)),
"gt" => f_op = W::O(FilterOperator::GreaterThan(map.next_value()?)),
"lt" => f_op = W::O(FilterOperator::LessThan(map.next_value()?)),