Skip to content

Commit

Permalink
lint fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sudo-shashank
sudo-shashank committed Aug 5, 2024
1 parent a65e159 commit 88ebdfb
Showing 1 changed file with 42 additions and 41 deletions.
83 changes: 42 additions & 41 deletions src/rpc/methods/eth/filters.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ use crate::lotus_json::lotus_json_with_self;
use crate::message::SignedMessage;
use crate::rpc::eth::EthAddress;
use crate::shim::clock::ChainEpoch;
use ahash::AHashMap as HashMap;
use cid::Cid;
use keccak_hash::H256;
use parking_lot::Mutex;
use schemars::JsonSchema;
use serde::*;
use std::any::Any;
use std::collections::HashMap;
use std::sync::{mpsc::Sender, Arc, Mutex};
use std::sync::{mpsc::Sender, Arc};
use std::time::SystemTime;
use thiserror::Error;
use uuid::Uuid;
Expand Down Expand Up @@ -103,7 +104,7 @@ impl MemFilterStore {

impl FilterStore for MemFilterStore {
fn add(&self, filter: Arc<dyn Filter>) -> Result<(), &'static str> {
let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();

if filters.len() >= self.max {
return Err("maximum number of filters registered");
Expand All @@ -118,12 +119,12 @@ impl FilterStore for MemFilterStore {
}

fn get(&self, id: FilterID) -> Result<Arc<dyn Filter>, &'static str> {
let filters = self.filters.lock().unwrap();
let filters = self.filters.lock();
filters.get(&id).cloned().ok_or("filter not found")
}

fn remove(&self, id: FilterID) -> Result<(), &'static str> {
let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();

if filters.remove(&id).is_none() {
return Err("filter not found");
Expand All @@ -133,7 +134,7 @@ impl FilterStore for MemFilterStore {
}

fn not_taken_since(&self, when: SystemTime) -> Vec<Arc<dyn Filter>> {
let filters = self.filters.lock().unwrap();
let filters = self.filters.lock();

filters
.values()
Expand Down Expand Up @@ -197,7 +198,7 @@ impl EthEventHandler {
.as_ref()
.unwrap()
.remove(f.id())
.unwrap_or_else(|_| ());
.unwrap_or(());
EthError::RemovalError(e.to_string())
})?;

Expand Down Expand Up @@ -329,15 +330,14 @@ impl EventFilterManager {
sub_channel: Mutex::new(None),
});

self.filters.lock().unwrap().insert(id, filter.clone());
self.filters.lock().insert(id, filter.clone());

Ok(filter)
}

pub fn remove(&self, id: FilterID) -> Result<(), String> {
self.filters
.lock()
.unwrap()
.remove(&id)
.ok_or_else(|| "filter not found".to_string())?;
Ok(())
Expand Down Expand Up @@ -365,17 +365,17 @@ impl Filter for EventFilter {
}

fn last_taken(&self) -> SystemTime {
*self.last_taken.lock().unwrap()
*self.last_taken.lock()
}

fn set_sub_channel(&self, sub_channel: Sender<Box<dyn Any + Send>>) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = Some(sub_channel);
self.collected.lock().unwrap().clear();
self.collected.lock().clear();
}

fn clear_sub_channel(&self) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = None;
}

Expand Down Expand Up @@ -502,8 +502,11 @@ fn parse_block_range(
Ok((min_height, max_height))
}

fn hex_str_to_epoch(hex_str: &str) -> Result<ChainEpoch, std::num::ParseIntError> {
i64::from_str_radix(&hex_str[2..], 16)
fn hex_str_to_epoch(hex_str: &str) -> Result<ChainEpoch, String> {
let hex_substring = hex_str
.get(2..)
.ok_or_else(|| "invalid hex string: unable to parse epoch".to_string())?;
i64::from_str_radix(hex_substring, 16).map_err(|e| e.to_string())
}

fn parse_eth_topics(topics: &EthTopicSpec) -> Result<HashMap<String, Vec<Vec<u8>>>, String> {
Expand All @@ -514,9 +517,7 @@ fn parse_eth_topics(topics: &EthTopicSpec) -> Result<HashMap<String, Vec<Vec<u8>
}
let key = format!("t{}", idx + 1);
for v in &vals.0 {
keys.entry(key.clone())
.or_insert_with(Vec::new)
.push(v.0 .0.to_vec());
keys.entry(key.clone()).or_default().push(v.0 .0.to_vec());
}
}
Ok(keys)
Expand All @@ -539,7 +540,7 @@ fn keys_to_keys_with_codec(
for vv in v {
keys_with_codec
.entry(k.clone())
.or_insert_with(Vec::new)
.or_default()
.push(ActorEventBlock {
codec: MULTICODEC_RAW,
value: vv,
Expand Down Expand Up @@ -581,8 +582,8 @@ impl TipSetFilter {
}
#[allow(dead_code)]
pub fn collect_tipset(&self, tipset_key: &TipsetKey) {
let mut collected = self.collected.lock().unwrap();
let sub_channel = self.sub_channel.lock().unwrap();
let mut collected = self.collected.lock();
let sub_channel = self.sub_channel.lock();

if let Some(ref ch) = *sub_channel {
ch.send(Box::new(tipset_key.clone())).ok();
Expand All @@ -597,8 +598,8 @@ impl TipSetFilter {
}
#[allow(dead_code)]
pub fn take_collected_tipsets(&self) -> Vec<TipsetKey> {
let mut collected = self.collected.lock().unwrap();
let mut last_taken = self.last_taken.lock().unwrap();
let mut collected = self.collected.lock();
let mut last_taken = self.last_taken.lock();

let result = collected.clone();
collected.clear();
Expand All @@ -614,17 +615,17 @@ impl Filter for TipSetFilter {
}

fn last_taken(&self) -> SystemTime {
*self.last_taken.lock().unwrap()
*self.last_taken.lock()
}

fn set_sub_channel(&self, sub_channel: Sender<Box<dyn Any + Send>>) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = Some(sub_channel);
self.collected.lock().unwrap().clear();
self.collected.lock().clear();
}

fn clear_sub_channel(&self) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = None;
}

Expand All @@ -648,7 +649,7 @@ impl TipSetFilterManager {
}
#[allow(dead_code)]
pub fn apply(&self, tipset_key: &TipsetKey) {
let filters = self.filters.lock().unwrap();
let filters = self.filters.lock();
for filter in filters.values() {
filter.collect_tipset(tipset_key);
}
Expand All @@ -658,14 +659,14 @@ impl TipSetFilterManager {
let filter = TipSetFilter::new(self.max_filter_results).map_err(|e| e.to_string())?;
let id = filter.id();

let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();
filters.insert(id, filter.clone());

Ok(filter)
}

pub fn remove(&self, id: FilterID) -> Result<(), String> {
let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();
filters
.remove(&id)
.ok_or_else(|| "filter not found".to_string())?;
Expand Down Expand Up @@ -696,8 +697,8 @@ impl MemPoolFilter {
}
#[allow(dead_code)]
pub fn collect_message(&self, message: SignedMessage) {
let mut collected = self.collected.lock().unwrap();
let sub_channel = self.sub_channel.lock().unwrap();
let mut collected = self.collected.lock();
let sub_channel = self.sub_channel.lock();

if let Some(ref ch) = *sub_channel {
ch.send(Box::new(message.clone())).ok();
Expand All @@ -712,8 +713,8 @@ impl MemPoolFilter {
}
#[allow(dead_code)]
pub fn take_collected_messages(&self) -> Vec<SignedMessage> {
let mut collected = self.collected.lock().unwrap();
let mut last_taken = self.last_taken.lock().unwrap();
let mut collected = self.collected.lock();
let mut last_taken = self.last_taken.lock();

let result = collected.clone();
collected.clear();
Expand All @@ -729,17 +730,17 @@ impl Filter for MemPoolFilter {
}

fn last_taken(&self) -> SystemTime {
*self.last_taken.lock().unwrap()
*self.last_taken.lock()
}

fn set_sub_channel(&self, sub_channel: Sender<Box<dyn Any + Send>>) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = Some(sub_channel);
self.collected.lock().unwrap().clear();
self.collected.lock().clear();
}

fn clear_sub_channel(&self) {
let mut sc = self.sub_channel.lock().unwrap();
let mut sc = self.sub_channel.lock();
*sc = None;
}

Expand All @@ -763,7 +764,7 @@ impl MemPoolFilterManager {
}
#[allow(dead_code)]
pub fn process_update(&self, message: SignedMessage) {
let filters = self.filters.lock().unwrap();
let filters = self.filters.lock();
for filter in filters.values() {
filter.collect_message(message.clone());
}
Expand All @@ -773,14 +774,14 @@ impl MemPoolFilterManager {
let filter = MemPoolFilter::new(self.max_filter_results).map_err(|e| e.to_string())?;
let id = filter.id();

let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();
filters.insert(id, filter.clone());

Ok(filter)
}

pub fn remove(&self, id: FilterID) -> Result<(), String> {
let mut filters = self.filters.lock().unwrap();
let mut filters = self.filters.lock();
filters
.remove(&id)
.ok_or_else(|| "filter not found".to_string())?;
Expand Down

0 comments on commit 88ebdfb

Please sign in to comment.