From d5bd285ced014a70860afd843c3bfa38ee009336 Mon Sep 17 00:00:00 2001 From: Ryan Croote Date: Sat, 27 Jan 2024 21:38:59 +0000 Subject: [PATCH] clippy --- src/monitor-canister/src/periodic.rs | 6 +++--- src/xrc/src/api/test.rs | 14 +++++++------- src/xrc/src/exchanges.rs | 12 ++++++------ src/xrc/src/forex/georgia.rs | 2 +- src/xrc/src/lib.rs | 2 +- src/xrc/src/periodic.rs | 8 ++++---- src/xrc/src/stablecoin.rs | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/monitor-canister/src/periodic.rs b/src/monitor-canister/src/periodic.rs index 953a7265..2bbb75b9 100644 --- a/src/monitor-canister/src/periodic.rs +++ b/src/monitor-canister/src/periodic.rs @@ -323,7 +323,7 @@ mod test { xrc.calls .read() .map(|calls| { - let call = calls.get(0).expect("there should be 1 call"); + let call = calls.first().expect("there should be 1 call"); assert_eq!(call.base_asset, request.base_asset); assert_eq!(call.quote_asset, request.quote_asset); assert_eq!(call.timestamp, request.timestamp); @@ -398,7 +398,7 @@ mod test { xrc.calls .read() .map(|calls| { - let call = calls.get(0).expect("there should be 1 call"); + let call = calls.first().expect("there should be 1 call"); assert_eq!(call.base_asset, request.base_asset); assert_eq!(call.quote_asset, request.quote_asset); assert_eq!(call.timestamp, request.timestamp); @@ -484,7 +484,7 @@ mod test { xrc.calls .read() .map(|calls| { - let call = calls.get(0).expect("there should be 1 call"); + let call = calls.first().expect("there should be 1 call"); assert_eq!(call.base_asset, request.base_asset); assert_eq!(call.quote_asset, request.quote_asset); assert_eq!(call.timestamp, request.timestamp); diff --git a/src/xrc/src/api/test.rs b/src/xrc/src/api/test.rs index eb561b90..88fa3da5 100644 --- a/src/xrc/src/api/test.rs +++ b/src/xrc/src/api/test.rs @@ -278,7 +278,7 @@ fn get_exchange_rate_will_not_charge_cycles_if_caller_is_privileged() { let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); assert_eq!( call_exchanges_impl .get_cryptocurrency_usdt_rate_calls @@ -312,7 +312,7 @@ fn get_exchange_rate_will_charge_cycles() { let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); assert_eq!( call_exchanges_impl .get_cryptocurrency_usdt_rate_calls @@ -351,7 +351,7 @@ fn get_exchange_rate_will_charge_the_base_cost_worth_of_cycles() { let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); assert_eq!( call_exchanges_impl .get_cryptocurrency_usdt_rate_calls @@ -391,7 +391,7 @@ fn get_exchange_rate_will_charge_the_base_cost_plus_outbound_cycles_worth_of_cyc let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); assert_eq!( call_exchanges_impl .get_cryptocurrency_usdt_rate_calls @@ -927,7 +927,7 @@ fn get_exchange_rate_will_retrieve_rates_if_inflight_tracking_does_not_contain_s let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); } /// This function tests that [get_exchange_rate] charges the maximum fee for usage when the request @@ -1051,7 +1051,7 @@ mod privileged_callers_can_bypass_pending { let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); } /// This function tests that [get_exchange_rate] allows privileged callers to bypass the pending check (crypto-fiat pair). @@ -1081,7 +1081,7 @@ mod privileged_callers_can_bypass_pending { let result = get_exchange_rate_internal(&env, &call_exchanges_impl, &request) .now_or_never() .expect("future should complete"); - assert!(matches!(result, Ok(_))); + assert!(result.is_ok()); } } diff --git a/src/xrc/src/exchanges.rs b/src/xrc/src/exchanges.rs index 2e835e83..179c4adc 100644 --- a/src/xrc/src/exchanges.rs +++ b/src/xrc/src/exchanges.rs @@ -274,7 +274,7 @@ impl IsExchange for KuCoin { extract_rate(bytes, |response: KuCoinResponse| { response .data - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.1.clone())) }) } @@ -338,7 +338,7 @@ impl IsExchange for Okx { extract_rate(bytes, |response: OkxResponse| { response .data - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.1.clone())) }) } @@ -372,7 +372,7 @@ impl IsExchange for GateIo { fn extract_rate(&self, bytes: &[u8]) -> Result { extract_rate(bytes, |response: GateIoResponse| { response - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.3.clone())) }) } @@ -397,7 +397,7 @@ impl IsExchange for Mexc { extract_rate(bytes, |response: MexcResponse| { response .data - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.1.clone())) }) } @@ -440,7 +440,7 @@ impl IsExchange for Poloniex { fn extract_rate(&self, bytes: &[u8]) -> Result { extract_rate(bytes, |response: PoloniexResponse| { response - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.2.clone())) }) } @@ -485,7 +485,7 @@ impl IsExchange for CryptoCom { response .result .data - .get(0) + .first() .map(|kline| ExtractedValue::Str(kline.o.clone())) }) } diff --git a/src/xrc/src/forex/georgia.rs b/src/xrc/src/forex/georgia.rs index 6bf8aa00..a59cd3f5 100644 --- a/src/xrc/src/forex/georgia.rs +++ b/src/xrc/src/forex/georgia.rs @@ -32,7 +32,7 @@ impl IsForex for CentralBankOfGeorgia { .map_err(|err| ExtractError::json_deserialize(bytes, err.to_string()))?; let timestamp = (timestamp / ONE_DAY_SECONDS) * ONE_DAY_SECONDS; - let obj = response.get(0).ok_or(ExtractError::RateNotFound { + let obj = response.first().ok_or(ExtractError::RateNotFound { filter: "Cannot find data for timestamp".to_string(), })?; let extracted_timestamp = NaiveDateTime::parse_from_str(&obj.date, "%Y-%m-%dT%H:%M:%S%.3fZ") diff --git a/src/xrc/src/lib.rs b/src/xrc/src/lib.rs index b133556d..ff0ae313 100644 --- a/src/xrc/src/lib.rs +++ b/src/xrc/src/lib.rs @@ -1171,7 +1171,7 @@ mod test { a_b_rate.forex_timestamp = Some(1); b_c_rate.forex_timestamp = Some(2); let a_c_rate = a_b_rate * b_c_rate; - assert!(matches!(a_c_rate.forex_timestamp, None)); + assert!(a_c_rate.forex_timestamp.is_none()); } /// The function verifies that that [QueriedExchangeRate] structs are divided correctly. diff --git a/src/xrc/src/periodic.rs b/src/xrc/src/periodic.rs index 33fc94b1..081a4797 100644 --- a/src/xrc/src/periodic.rs +++ b/src/xrc/src/periodic.rs @@ -83,7 +83,7 @@ impl ForexSources for ForexSourcesImpl { // Await all futures to complete let joined = join_all(futures).await; // Zip times and results - let results = times.into_iter().zip(joined.into_iter()); + let results = times.into_iter().zip(joined); let mut rates = vec![]; let mut errors = vec![]; @@ -402,7 +402,7 @@ mod test { #[test] fn check_forex_status_weekend() { - let forex = FOREX_SOURCES.get(0).expect("Myanmar expected"); // Myanmar + let forex = FOREX_SOURCES.first().expect("Myanmar expected"); // Myanmar assert!(matches!( check_forex_status(forex, 1680372000), Err(ForexStatusError::Weekend) @@ -412,7 +412,7 @@ mod test { #[test] fn check_forex_status_already_collected() { let timestamp = 1680220800; - let forex = FOREX_SOURCES.get(0).expect("Myanmar expected"); // Myanmar + let forex = FOREX_SOURCES.first().expect("Myanmar expected"); // Myanmar with_forex_rate_collector_mut(|collector| { collector.update( forex.to_string(), @@ -429,7 +429,7 @@ mod test { #[test] fn check_forex_status_is_ok() { let timestamp = 1680220800; - let forex = FOREX_SOURCES.get(0).expect("Myanmar expected"); // Myanmar + let forex = FOREX_SOURCES.first().expect("Myanmar expected"); // Myanmar let result = check_forex_status(forex, timestamp); assert!(matches!(result, Ok(()))); } diff --git a/src/xrc/src/stablecoin.rs b/src/xrc/src/stablecoin.rs index 0b384a7d..739cb53d 100644 --- a/src/xrc/src/stablecoin.rs +++ b/src/xrc/src/stablecoin.rs @@ -56,7 +56,7 @@ pub(crate) fn get_stablecoin_rate( return Err(StablecoinRateError::TooFewRates(stablecoin_rates.len())); } let quote_asset = &stablecoin_rates - .get(0) + .first() .expect("There should always be at least one rate") .quote_asset;