@@ -258,7 +258,7 @@ fn create_fork_request<DB: DatabaseExt>(
258258
259259/// Retrieve the logs specified for the current fork.
260260/// Equivalent to eth_getLogs but on a cheatcode.
261- fn eth_getlogs < DB : DatabaseExt > ( data : & mut EVMData < DB > , inner : & EthGetLogsCall ) -> Result {
261+ fn eth_getlogs < DB : DatabaseExt > ( data : & EVMData < DB > , inner : & EthGetLogsCall ) -> Result {
262262 let url = data. db . active_fork_url ( ) . ok_or ( fmt_err ! ( "No active fork url found" ) ) ?;
263263 if inner. 0 > U256 :: from ( u64:: MAX ) || inner. 1 > U256 :: from ( u64:: MAX ) {
264264 return Err ( fmt_err ! ( "Blocks in block range must be less than 2^64 - 1" ) )
@@ -287,7 +287,7 @@ fn eth_getlogs<DB: DatabaseExt>(data: &mut EVMData<DB>, inner: &EthGetLogsCall)
287287 . block_on ( provider. get_logs ( & filter) )
288288 . map_err ( |_| fmt_err ! ( "Error in calling eth_getLogs" ) ) ?;
289289
290- if logs. len ( ) == 0 {
290+ if logs. is_empty ( ) {
291291 let empty: Bytes = abi:: encode ( & [ Token :: Array ( vec ! [ ] ) ] ) . into ( ) ;
292292 return Ok ( empty)
293293 }
@@ -335,7 +335,7 @@ fn eth_getlogs<DB: DatabaseExt>(data: &mut EVMData<DB>, inner: &EthGetLogsCall)
335335 Ok ( result)
336336}
337337
338- fn rpc < DB : DatabaseExt > ( data : & mut EVMData < DB > , inner : & RpcCall ) -> Result {
338+ fn rpc < DB : DatabaseExt > ( data : & EVMData < DB > , inner : & RpcCall ) -> Result {
339339 let url = data. db . active_fork_url ( ) . ok_or ( fmt_err ! ( "No active fork url found" ) ) ?;
340340 let provider = ProviderBuilder :: new ( url) . build ( ) ?;
341341
@@ -350,15 +350,12 @@ fn rpc<DB: DatabaseExt>(data: &mut EVMData<DB>, inner: &RpcCall) -> Result {
350350 let result_as_tokens =
351351 value_to_token ( & result) . map_err ( |err| fmt_err ! ( "Failed to parse result: {err}" ) ) ?;
352352
353- let abi_encoded: Vec < u8 > ;
354- match result_as_tokens {
355- Token :: Tuple ( vec) | Token :: Array ( vec) | Token :: FixedArray ( vec) => {
356- abi_encoded = abi:: encode ( & vec) ;
357- }
353+ let abi_encoded: Vec < u8 > = match result_as_tokens {
354+ Token :: Tuple ( vec) | Token :: Array ( vec) | Token :: FixedArray ( vec) => abi:: encode ( & vec) ,
358355 _ => {
359356 let vec = vec ! [ result_as_tokens] ;
360- abi_encoded = abi:: encode ( & vec) ;
357+ abi:: encode ( & vec)
361358 }
362- }
359+ } ;
363360 Ok ( abi_encoded. into ( ) )
364361}
0 commit comments