From 00ddb91f9ccb1f1f73c1c22b4dc160bed9b2286f Mon Sep 17 00:00:00 2001 From: jk jensen Date: Wed, 11 Sep 2024 09:44:12 -0700 Subject: [PATCH] [deps] bump itertools version (#19307) ## Description Introduces some [breaking changes](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md), trying to see if anything yells. ## Test plan Counting on signals for this one. None of the breaking changes listed in the itertools changelog appear anywhere in our codebase based on grepping for them. --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] REST API: --- Cargo.lock | 38 +++++++++---------- Cargo.toml | 2 +- .../src/workloads/adversarial.rs | 3 +- crates/sui-core/src/authority.rs | 4 +- crates/sui-storage/src/indexes.rs | 2 +- crates/sui-tool/src/lib.rs | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75a672619a8ac..ef8e301f2c8ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2715,7 +2715,7 @@ dependencies = [ "hyper 1.4.1", "hyper-rustls 0.27.2", "hyper-util", - "itertools 0.10.5", + "itertools 0.13.0", "mockall", "mysten-common", "mysten-metrics", @@ -8208,7 +8208,7 @@ dependencies = [ "futures", "governor", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools 0.13.0", "mockall", "mysten-common", "mysten-metrics", @@ -8272,7 +8272,7 @@ dependencies = [ "fastcrypto", "fdlimit", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools 0.13.0", "mysten-metrics", "mysten-network", "narwhal-config", @@ -8354,7 +8354,7 @@ dependencies = [ "fastcrypto", "futures", "governor", - "itertools 0.10.5", + "itertools 0.13.0", "mysten-metrics", "mysten-network", "narwhal-config", @@ -12811,7 +12811,7 @@ dependencies = [ "futures", "hdrhistogram", "indicatif", - "itertools 0.10.5", + "itertools 0.13.0", "move-core-types", "mysten-metrics", "prometheus", @@ -13057,7 +13057,7 @@ dependencies = [ "futures", "im", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools 0.13.0", "jsonrpsee", "lru 0.10.0", "mockall", @@ -13532,7 +13532,7 @@ dependencies = [ "hyper 1.4.1", "im", "insta", - "itertools 0.10.5", + "itertools 0.13.0", "lru 0.10.0", "move-binary-format", "move-bytecode-utils", @@ -13624,7 +13624,7 @@ dependencies = [ "fastcrypto", "futures", "hex", - "itertools 0.10.5", + "itertools 0.13.0", "jsonrpsee", "move-binary-format", "move-bytecode-utils", @@ -13723,7 +13723,7 @@ dependencies = [ "http-body 0.4.5", "hyper 1.4.1", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools 0.13.0", "jsonrpsee", "mockall", "move-binary-format", @@ -13826,7 +13826,7 @@ dependencies = [ "colored", "enum_dispatch", "fastcrypto", - "itertools 0.10.5", + "itertools 0.13.0", "json_to_table", "move-binary-format", "move-bytecode-utils", @@ -14200,7 +14200,7 @@ name = "sui-open-rpc-macros" version = "0.1.0" dependencies = [ "derive-syn-parse", - "itertools 0.10.5", + "itertools 0.13.0", "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.107", @@ -14344,7 +14344,7 @@ dependencies = [ "hex", "hyper 1.4.1", "ipnetwork", - "itertools 0.10.5", + "itertools 0.13.0", "mime", "multiaddr", "mysten-metrics", @@ -14429,7 +14429,7 @@ dependencies = [ "bcs", "diffy", "fastcrypto", - "itertools 0.10.5", + "itertools 0.13.0", "mime", "mysten-network", "openapiv3", @@ -14503,7 +14503,7 @@ dependencies = [ "dashmap", "dirs 4.0.0", "futures", - "itertools 0.10.5", + "itertools 0.13.0", "serde", "serde_json", "shared-crypto", @@ -14779,7 +14779,7 @@ dependencies = [ "hyper-rustls 0.27.2", "indicatif", "integer-encoding", - "itertools 0.10.5", + "itertools 0.13.0", "lru 0.10.0", "moka", "move-binary-format", @@ -14960,7 +14960,7 @@ dependencies = [ "futures", "hex", "indicatif", - "itertools 0.10.5", + "itertools 0.13.0", "move-core-types", "num_cpus", "object_store", @@ -15090,7 +15090,7 @@ dependencies = [ "fastcrypto-zkp", "im", "indexmap 2.2.6", - "itertools 0.10.5", + "itertools 0.13.0", "jsonrpsee", "lru 0.10.0", "move-binary-format", @@ -16571,7 +16571,7 @@ dependencies = [ "eyre", "fdlimit", "hdrhistogram", - "itertools 0.10.5", + "itertools 0.13.0", "msim", "once_cell", "ouroboros 0.17.2", @@ -16599,7 +16599,7 @@ dependencies = [ name = "typed-store-derive" version = "0.3.0" dependencies = [ - "itertools 0.10.5", + "itertools 0.13.0", "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.107", diff --git a/Cargo.toml b/Cargo.toml index cef540e3bf483..081e90e0735b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -365,7 +365,7 @@ inquire = "0.6.0" insta = { version = "1.21.1", features = ["redactions", "yaml", "json"] } integer-encoding = "3.0.1" ipnetwork = "0.20.0" -itertools = "0.10.5" +itertools = "0.13.0" jemalloc-ctl = "^0.5" jsonrpsee = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b300784795f6a64d0fcdf8f03081a9bc38bde8", features = [ "server", diff --git a/crates/sui-benchmark/src/workloads/adversarial.rs b/crates/sui-benchmark/src/workloads/adversarial.rs index 970e98baf9d86..f4d871d79bf40 100644 --- a/crates/sui-benchmark/src/workloads/adversarial.rs +++ b/crates/sui-benchmark/src/workloads/adversarial.rs @@ -15,7 +15,6 @@ use crate::ProgrammableTransactionBuilder; use crate::{convert_move_call_args, BenchMoveCallArg, ExecutionEffects, ValidatorProxy}; use anyhow::anyhow; use async_trait::async_trait; -use itertools::Itertools; use move_core_types::identifier::Identifier; use rand::distributions::{Distribution, Standard}; use rand::Rng; @@ -144,7 +143,7 @@ impl FromStr for AdversarialPayloadCfg { if !re.is_match(s) { return Err(anyhow!("invalid load config")); }; - let toks = s.split('-').collect_vec(); + let toks = s.split('-').collect::>(); let payload_type = AdversarialPayloadType::from_str(toks[0])?; let load_factor = toks[1].parse::().unwrap(); diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs index 7a003b8b0ec68..1e626d50c5897 100644 --- a/crates/sui-core/src/authority.rs +++ b/crates/sui-core/src/authority.rs @@ -4381,7 +4381,7 @@ impl AuthorityState { desired_upgrades.sort(); desired_upgrades .into_iter() - .group_by(|(packages, _authority)| packages.clone()) + .chunk_by(|(packages, _authority)| packages.clone()) .into_iter() .find_map(|(packages, group)| { // should have been filtered out earlier. @@ -4468,7 +4468,7 @@ impl AuthorityState { desired_upgrades.sort(); desired_upgrades .into_iter() - .group_by(|(digest, packages, _authority)| (*digest, packages.clone())) + .chunk_by(|(digest, packages, _authority)| (*digest, packages.clone())) .into_iter() .find_map(|((digest, packages), group)| { // should have been filtered out earlier. diff --git a/crates/sui-storage/src/indexes.rs b/crates/sui-storage/src/indexes.rs index 898bba45a45d5..6302045a55f88 100644 --- a/crates/sui-storage/src/indexes.rs +++ b/crates/sui-storage/src/indexes.rs @@ -1461,7 +1461,7 @@ impl IndexStore { metrics.all_balance_lookup_from_db.inc(); let mut balances: HashMap = HashMap::new(); let coins = Self::get_owned_coins_iterator(&coin_index, owner, None)? - .group_by(|(coin_type, _obj_id, _coin)| coin_type.clone()); + .chunk_by(|(coin_type, _obj_id, _coin)| coin_type.clone()); for (coin_type, coins) in &coins { let mut total_balance = 0i128; let mut coin_object_count = 0; diff --git a/crates/sui-tool/src/lib.rs b/crates/sui-tool/src/lib.rs index c748e6c76f49a..853445cf9f921 100644 --- a/crates/sui-tool/src/lib.rs +++ b/crates/sui-tool/src/lib.rs @@ -406,7 +406,7 @@ pub async fn get_transaction_block( .sorted_by(|(k1, err1, _), (k2, err2, _)| { Ord::cmp(k1, k2).then_with(|| Ord::cmp(err1, err2)) }) - .group_by(|(_, _err, r)| { + .chunk_by(|(_, _err, r)| { r.2.as_ref().map(|ok_result| match &ok_result.status { TransactionStatus::Signed(_) => None, TransactionStatus::Executed(_, effects, _) => Some((