From 9d7c1dfc90392fdbb6f3da3ac7de9fa529b880f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marin=20Ver=C5=A1i=C4=87?= Date: Tue, 22 Oct 2024 14:13:33 +0200 Subject: [PATCH 1/2] chore: remove riffle_iter (#5181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marin Veršić --- crates/iroha_primitives/src/lib.rs | 1 - crates/iroha_primitives/src/riffle_iter.rs | 144 --------------------- 2 files changed, 145 deletions(-) delete mode 100644 crates/iroha_primitives/src/riffle_iter.rs diff --git a/crates/iroha_primitives/src/lib.rs b/crates/iroha_primitives/src/lib.rs index 0face676e98..f2647272e66 100644 --- a/crates/iroha_primitives/src/lib.rs +++ b/crates/iroha_primitives/src/lib.rs @@ -20,7 +20,6 @@ pub mod conststr; pub mod json; pub mod must_use; pub mod numeric; -pub mod riffle_iter; pub mod small; #[cfg(feature = "std")] pub mod time; diff --git a/crates/iroha_primitives/src/riffle_iter.rs b/crates/iroha_primitives/src/riffle_iter.rs deleted file mode 100644 index 23d15a04154..00000000000 --- a/crates/iroha_primitives/src/riffle_iter.rs +++ /dev/null @@ -1,144 +0,0 @@ -//! Contains riffle iterator and related trait - -/// Iterator which combine two iterators into the single one. -/// Name is inspired by riffle shuffle of cards deck. -/// -/// ```ignore -/// [(a0,a1,a2,..),(b0,b1,b2,..)] -> (a0,b0,a1,b1,a2,b2,..) -/// ``` -#[derive(Clone)] -pub struct RiffleIterator { - left_iter: A, - right_iter: B, - state: RiffleState, -} - -#[derive(Clone, Copy)] -enum RiffleState { - CurrentLeft, - CurrentRight, - LeftExhausted, - RightExhausted, - BothExhausted, -} - -/// Trait to create [`RiffleIterator`] from two iterators. -pub trait RiffleIter: Iterator + Sized { - /// Create `RoundRobinIterator` from two iterators. - fn riffle>( - self, - iter: I, - ) -> RiffleIterator::IntoIter> { - RiffleIterator { - left_iter: self, - right_iter: iter.into_iter(), - state: RiffleState::CurrentLeft, - } - } -} - -impl RiffleIter for T {} - -impl Iterator for RiffleIterator -where - A: Iterator, - B: Iterator, -{ - type Item = T; - - fn next(&mut self) -> Option { - use RiffleState::*; - loop { - match self.state { - BothExhausted => break None, - LeftExhausted => { - let item = self.right_iter.next(); - if item.is_none() { - self.state = BothExhausted; - } - break item; - } - RightExhausted => { - let item = self.left_iter.next(); - if item.is_none() { - self.state = BothExhausted; - } - break item; - } - CurrentLeft => { - let item = self.left_iter.next(); - if item.is_none() { - self.state = LeftExhausted; - continue; - } - self.state = CurrentRight; - break item; - } - CurrentRight => { - let item = self.right_iter.next(); - if item.is_none() { - self.state = RightExhausted; - continue; - } - self.state = CurrentLeft; - break item; - } - } - } - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn riffle_iter_a_eq_b_size() { - let a = vec![0, 2, 4, 6, 8]; - let b = vec![1, 3, 5, 7, 9]; - assert_eq!( - vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - a.into_iter().riffle(b).collect::>() - ); - } - - #[test] - fn riffle_iter_a_gt_b_size() { - let a = vec![0, 2, 4, 6, 8]; - let b = vec![1, 3, 5]; - assert_eq!( - vec![0, 1, 2, 3, 4, 5, 6, 8], - a.into_iter().riffle(b).collect::>() - ); - } - - #[test] - fn riffle_iter_a_lt_b_size() { - let a = vec![0, 2, 4]; - let b = vec![1, 3, 5, 7, 9]; - assert_eq!( - vec![0, 1, 2, 3, 4, 5, 7, 9], - a.into_iter().riffle(b).collect::>() - ); - } - - #[test] - fn riffle_iter_a_empty() { - let a = vec![0, 2, 4, 6, 8]; - let b = Vec::new(); - assert_eq!( - vec![0, 2, 4, 6, 8], - a.into_iter().riffle(b).collect::>() - ); - } - - #[test] - fn riffle_iter_b_empty() { - let a = Vec::new(); - let b = vec![1, 3, 5, 7, 9]; - assert_eq!( - vec![1, 3, 5, 7, 9], - a.into_iter().riffle(b).collect::>() - ); - } -} From 34b565545032fce810a86acd8f42f8a4a80946f6 Mon Sep 17 00:00:00 2001 From: Dmitry Murzin Date: Wed, 23 Oct 2024 09:27:23 +0300 Subject: [PATCH 2/2] fix: Fix `cargo audit` warnings (#5183) * Remove `byte-unit` dependency * Update `owo-colors` to 4.1.0 * Update `futures` to 0.3.31 --------- Signed-off-by: Dmitry Murzin --- Cargo.lock | 282 +++++------------------------- Cargo.toml | 2 +- crates/iroha_core/Cargo.toml | 2 - crates/iroha_core/benches/kura.rs | 5 +- 4 files changed, 43 insertions(+), 248 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84071c580bd..21dc980e338 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,17 +39,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -382,17 +371,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -596,30 +574,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "borsh" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" -dependencies = [ - "borsh-derive", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.79", - "syn_derive", -] - [[package]] name = "bstr" version = "1.10.0" @@ -643,39 +597,6 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" -[[package]] -name = "byte-unit" -version = "5.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e" -dependencies = [ - "rust_decimal", - "serde", - "utf8-width", -] - -[[package]] -name = "bytecheck" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "byteorder" version = "1.5.0" @@ -899,7 +820,7 @@ dependencies = [ "eyre", "indenter", "once_cell", - "owo-colors", + "owo-colors 3.5.0", "tracing-error", ] @@ -910,7 +831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", - "owo-colors", + "owo-colors 3.5.0", "tracing-core", "tracing-error", ] @@ -937,7 +858,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cba00cef522c2597dfbb0a8d1b0ac8ac2b99714f50cc354cda71da63164da0be" dependencies = [ - "ahash 0.8.11", + "ahash", "arc-swap", "crossbeam-epoch", "crossbeam-queue", @@ -1829,9 +1750,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1844,9 +1765,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1854,15 +1775,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1871,15 +1792,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -1888,21 +1809,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2560,9 +2481,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] [[package]] name = "hashbrown" @@ -2570,7 +2488,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash", ] [[package]] @@ -2579,7 +2497,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", "serde", ] @@ -2615,15 +2533,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -3147,7 +3056,6 @@ name = "iroha_core" version = "2.0.0-rc.1.0" dependencies = [ "async-trait", - "byte-unit", "criterion", "crossbeam-queue", "dashmap", @@ -3620,7 +3528,7 @@ dependencies = [ "iroha_data_model", "iroha_primitives", "nonzero_ext", - "owo-colors", + "owo-colors 4.1.0", "path-absolutize", "pathdiff", "serde", @@ -3812,7 +3720,7 @@ dependencies = [ "clap", "color-eyre", "eyre", - "owo-colors", + "owo-colors 4.1.0", "path-absolutize", "serde_json", "sha256", @@ -3870,7 +3778,7 @@ dependencies = [ "iroha_torii", "iroha_version", "json5", - "owo-colors", + "owo-colors 4.1.0", "path-absolutize", "serial_test", "supports-color 2.1.0", @@ -4526,8 +4434,15 @@ name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" dependencies = [ - "supports-color 1.3.1", + "supports-color 2.1.0", + "supports-color 3.0.1", ] [[package]] @@ -4842,29 +4757,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-error-attr2" version = "2.0.0" @@ -4993,26 +4885,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" version = "1.0.37" @@ -5155,15 +5027,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - [[package]] name = "reqwest" version = "0.12.8" @@ -5232,35 +5095,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rkyv" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" -dependencies = [ - "bitvec", - "bytecheck", - "bytes", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "rle-decode-fast" version = "1.0.3" @@ -5274,13 +5108,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", - "borsh", - "bytes", "num-traits", - "rand", - "rkyv", "serde", - "serde_json", ] [[package]] @@ -5440,12 +5269,6 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a7b59a5d9b0099720b417b6325d91a52cbf5b3dcb5041d864be53eefa58abc" -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - [[package]] name = "sec1" version = "0.7.3" @@ -5755,12 +5578,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - [[package]] name = "slab" version = "0.4.9" @@ -5921,21 +5738,20 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "supports-color" -version = "1.3.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ - "atty", + "is-terminal", "is_ci", ] [[package]] name = "supports-color" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" dependencies = [ - "is-terminal", "is_ci", ] @@ -5984,18 +5800,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6698,12 +6502,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - [[package]] name = "utf8parse" version = "0.2.2" @@ -6932,7 +6730,7 @@ version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" dependencies = [ - "ahash 0.8.11", + "ahash", "bitflags 2.6.0", "hashbrown 0.14.5", "indexmap 2.6.0", diff --git a/Cargo.toml b/Cargo.toml index 63d94b05425..6028d2e1b92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,7 +82,7 @@ url = "2.5.2" prometheus = { version = "0.13.4", default-features = false } clap = "4.5.11" -owo-colors = "3.5.0" +owo-colors = "4.1.0" supports-color = "2.1.0" inquire = "0.6.2" spinoff = "0.8.0" diff --git a/crates/iroha_core/Cargo.toml b/crates/iroha_core/Cargo.toml index 22820a3eddd..10d266bd5af 100644 --- a/crates/iroha_core/Cargo.toml +++ b/crates/iroha_core/Cargo.toml @@ -73,8 +73,6 @@ criterion = { workspace = true } hex = { workspace = true } tempfile = { workspace = true } -byte-unit = "5.1.4" - [[bench]] name = "validation" harness = false diff --git a/crates/iroha_core/benches/kura.rs b/crates/iroha_core/benches/kura.rs index 1d4856bebb5..9ff2fb8eb4c 100644 --- a/crates/iroha_core/benches/kura.rs +++ b/crates/iroha_core/benches/kura.rs @@ -1,6 +1,5 @@ #![allow(missing_docs)] -use byte_unit::{Byte, UnitType}; use criterion::{criterion_group, criterion_main, Criterion}; use iroha_config::{ base::WithOrigin, @@ -75,8 +74,8 @@ async fn measure_block_size_for_n_executors(n_executors: u32) { block_store.append_block_to_chain(&block.into()).unwrap(); let metadata = fs::metadata(dir.path().join("blocks.data")).await.unwrap(); - let file_size = Byte::from(metadata.len()).get_appropriate_unit(UnitType::Decimal); - println!("For {n_executors} executors: {file_size}"); + let file_size = metadata.len(); + println!("For {n_executors} executors: {file_size} bytes"); } async fn measure_block_size_async() {