From 2a260d46f8611be7ba54c2955c19dd50f63c53fb Mon Sep 17 00:00:00 2001 From: Drazen Urch Date: Mon, 17 Jun 2024 15:29:19 +0200 Subject: [PATCH] New clippy lints (#4660) * New clippy lints * I guess this got removed --- common/nymsphinx/chunking/src/fragment.rs | 66 ++--- common/nymsphinx/chunking/src/lib.rs | 4 +- .../nymsphinx/chunking/src/reconstruction.rs | 64 +++-- common/nymsphinx/chunking/src/set.rs | 50 ++-- contracts/Cargo.lock | 237 ++++-------------- explorer-api/src/service_providers/http.rs | 2 + nym-api/src/support/storage/models.rs | 3 + nym-outfox/src/format.rs | 1 - nym-wallet/Cargo.lock | 54 ++-- .../network-requester/src/core.rs | 1 + wasm/mix-fetch/src/harbourmaster.rs | 2 + 11 files changed, 172 insertions(+), 312 deletions(-) diff --git a/common/nymsphinx/chunking/src/fragment.rs b/common/nymsphinx/chunking/src/fragment.rs index b112bdb47f..73bce8344c 100644 --- a/common/nymsphinx/chunking/src/fragment.rs +++ b/common/nymsphinx/chunking/src/fragment.rs @@ -300,8 +300,8 @@ impl Fragment { #[derive(PartialEq, Clone, Debug)] pub(crate) struct FragmentHeader { /// ID associated with `FragmentSet` to which this particular `Fragment` belongs. - /// Its value is restricted to (0, i32::max_value()]. - /// Note that it *excludes* 0, but *includes* i32::max_value(). + /// Its value is restricted to (0, i32::MAX]. + /// Note that it *excludes* 0, but *includes* i32::MAX. /// This allows the field to be represented using 31 bits. id: i32, @@ -319,7 +319,7 @@ pub(crate) struct FragmentHeader { previous_fragments_set_id: Option, /// Optional ID of next `FragmentSet` into which the original message was split. - /// Note, this option is only valid of `current_fragment == total_fragments == u8::max_value()` + /// Note, this option is only valid of `current_fragment == total_fragments == u8::MAX` next_fragments_set_id: Option, } @@ -414,7 +414,7 @@ impl FragmentHeader { if current_fragment == 1 { previous_fragments_set_id = Some(linked_id); - } else if total_fragments == current_fragment && current_fragment == u8::max_value() { + } else if total_fragments == current_fragment && current_fragment == u8::MAX { next_fragments_set_id = Some(linked_id); } else { return Err(ChunkingError::MalformedHeaderError); @@ -585,14 +585,7 @@ mod fragment_tests { rng.fill_bytes(&mut msg); let fragment = Fragment { - header: FragmentHeader::try_new( - 12345, - u8::max_value(), - u8::max_value(), - None, - Some(1234), - ) - .unwrap(), + header: FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(), payload: msg, }; let packet_bytes = fragment.clone().into_bytes(); @@ -602,14 +595,7 @@ mod fragment_tests { rng.fill_bytes(&mut msg); let fragment = Fragment { - header: FragmentHeader::try_new( - 12345, - u8::max_value(), - u8::max_value(), - None, - Some(1234), - ) - .unwrap(), + header: FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(), payload: msg, }; let packet_bytes = fragment.clone().into_bytes(); @@ -822,8 +808,8 @@ mod fragment_tests { assert!(Fragment::try_new( &full_payload, id, - u8::max_value(), - u8::max_value(), + u8::MAX, + u8::MAX, None, Some(link_id), max_plaintext_size(), @@ -884,8 +870,8 @@ mod fragment_tests { assert!(Fragment::try_new( &non_full_payload, id, - u8::max_value(), - u8::max_value(), + u8::MAX, + u8::MAX, None, Some(link_id), max_plaintext_size(), @@ -894,8 +880,8 @@ mod fragment_tests { assert!(Fragment::try_new( &non_full_payload2, id, - u8::max_value(), - u8::max_value(), + u8::MAX, + u8::MAX, None, Some(link_id), max_plaintext_size(), @@ -905,8 +891,8 @@ mod fragment_tests { assert!(Fragment::try_new( &too_much_payload, id, - u8::max_value(), - u8::max_value(), + u8::MAX, + u8::MAX, None, Some(link_id), max_plaintext_size(), @@ -1008,14 +994,7 @@ mod fragment_header { fn fragmented_header_cannot_be_created_with_zero_id() { assert!(FragmentHeader::try_new(0, 10, 5, None, None).is_err()); assert!(FragmentHeader::try_new(12345, 10, 5, Some(0), None).is_err()); - assert!(FragmentHeader::try_new( - 12345, - u8::max_value(), - u8::max_value(), - None, - Some(0), - ) - .is_err()); + assert!(FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(0),).is_err()); } #[test] @@ -1066,14 +1045,7 @@ mod fragment_header { #[test] fn can_only_be_post_linked_for_last_fragment() { assert!(FragmentHeader::try_new(12345, 10, 10, None, Some(1234)).is_ok()); - assert!(FragmentHeader::try_new( - 12345, - u8::max_value(), - u8::max_value(), - None, - Some(1234), - ) - .is_ok()); + assert!(FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234),).is_ok()); assert!(FragmentHeader::try_new(12345, 10, 2, Some(1234), None).is_err()); } @@ -1117,8 +1089,7 @@ mod fragment_header { #[test] fn post_linked_can_be_converted_to_and_from_bytes_for_exact_number_of_bytes_provided() { let fragmented_header = - FragmentHeader::try_new(12345, u8::max_value(), u8::max_value(), None, Some(1234)) - .unwrap(); + FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(); let header_bytes = fragmented_header.to_bytes(); let (recovered_header, bytes_used) = @@ -1130,8 +1101,7 @@ mod fragment_header { #[test] fn post_linked_can_be_converted_to_and_from_bytes_for_more_than_required_number_of_bytes() { let fragmented_header = - FragmentHeader::try_new(12345, u8::max_value(), u8::max_value(), None, Some(1234)) - .unwrap(); + FragmentHeader::try_new(12345, u8::MAX, u8::MAX, None, Some(1234)).unwrap(); let mut header_bytes = fragmented_header.to_bytes(); header_bytes.append(vec![1, 2, 3, 4, 5].as_mut()); diff --git a/common/nymsphinx/chunking/src/lib.rs b/common/nymsphinx/chunking/src/lib.rs index e71485aa79..03ddd3541f 100644 --- a/common/nymsphinx/chunking/src/lib.rs +++ b/common/nymsphinx/chunking/src/lib.rs @@ -41,7 +41,7 @@ pub mod set; /// (or implicitly the only one), it has no lower bound on the number of `Fragment`s. /// (Apart from the restriction of containing at least a single one). If the set is located /// somewhere in the middle, *it must be* full. Finally, regardless of its position, it must also be -/// true that it contains no more than `u8::max_value()`, i.e. 255 `Fragment`s. +/// true that it contains no more than `u8::MAX`, i.e. 255 `Fragment`s. /// Again, the reasoning for this is further explained in `set.rs` file. However, you might /// also want to look at `fragment.rs` to understand the full context behind that design choice. /// @@ -151,7 +151,7 @@ mod tests { - MAX_NODE_ADDRESS_UNPADDED_LEN; let plaintext_lens = vec![17, used_plaintext_len, 20, 42, 10000]; - const SET_LEN: usize = u8::max_value() as usize; + const SET_LEN: usize = u8::MAX as usize; for plaintext_len in plaintext_lens { let unlinked_len = unlinked_fragment_payload_max_len(plaintext_len); diff --git a/common/nymsphinx/chunking/src/reconstruction.rs b/common/nymsphinx/chunking/src/reconstruction.rs index ecd7c6fb85..e87495f2d2 100644 --- a/common/nymsphinx/chunking/src/reconstruction.rs +++ b/common/nymsphinx/chunking/src/reconstruction.rs @@ -24,7 +24,7 @@ struct ReconstructionBuffer { previous_fragments_set_id: Option, /// Once all fragments are received, the value of `next_fragments_set_id` is copied /// from the last `Fragment` in the set (assuming the set is full, i.e. it contains - /// `u8::max_value()` elements). + /// `u8::MAX` elements). next_fragments_set_id: Option, /// The actual `Fragment` data held by the `ReconstructionBuffer`. When created it is already @@ -40,7 +40,7 @@ pub type ReconstructedMessage = (Vec, Vec); impl ReconstructionBuffer { /// Initialises new instance of a `ReconstructionBuffer` with given size, i.e. /// number of expected `Fragment`s in the set. - /// The `u8` input type of `size` argument ensures it has the `u8::max_value()` upper bound. + /// The `u8` input type of `size` argument ensures it has the `u8::MAX` upper bound. fn new(size: u8) -> Self { // Note: `new` should have never been called with size 0 in the first place // as `size` value is based on the first recovered `Fragment` in the set. @@ -122,8 +122,8 @@ impl ReconstructionBuffer { .as_ref() .unwrap() .previous_fragments_set_id(); - self.next_fragments_set_id = if self.fragments.len() == u8::max_value() as usize { - self.fragments[u8::max_value() as usize - 1] + self.next_fragments_set_id = if self.fragments.len() == u8::MAX as usize { + self.fragments[u8::MAX as usize - 1] .as_ref() .unwrap() .next_fragments_set_id() @@ -313,8 +313,8 @@ mod reconstruction_buffer { assert_eq!(None, frag); } - let buf = ReconstructionBuffer::new(u8::max_value()); - assert_eq!(u8::max_value() as usize, buf.fragments.len()); + let buf = ReconstructionBuffer::new(u8::MAX); + assert_eq!(u8::MAX as usize, buf.fragments.len()); for frag in buf.fragments { assert_eq!(None, frag); } @@ -358,11 +358,11 @@ mod reconstruction_buffer { buf.insert_fragment(Fragment::try_from_bytes(&raw_fragments[2]).unwrap()); assert_eq!(message.to_vec(), buf.reconstruct_set_data()); - let mut buf = ReconstructionBuffer::new(u8::max_value()); + let mut buf = ReconstructionBuffer::new(u8::MAX); let message = vec![ 42u8; unlinked_fragment_payload_max_len(AVAILABLE_PLAINTEXT_SIZE) - * u8::max_value() as usize + * u8::MAX as usize ]; let raw_fragments: Vec<_> = crate::split_into_sets(&mut rand::rngs::OsRng, &message, AVAILABLE_PLAINTEXT_SIZE) @@ -445,7 +445,7 @@ mod reconstruction_buffer { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) { buf.insert_fragment(Fragment::try_from_bytes(raw_fragment).unwrap()); } @@ -563,7 +563,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -611,7 +611,7 @@ mod message_reconstructor { .collect(); // note that first set is not fully inserted - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -657,7 +657,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -699,7 +699,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -738,7 +738,7 @@ mod message_reconstructor { .collect(); // note that first set is not fully inserted - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize - 1) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize - 1) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -779,7 +779,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize * 2) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize * 2) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -793,7 +793,7 @@ mod message_reconstructor { assert!(reconstructor .insert_new_fragment( reconstructor - .recover_fragment(raw_fragments[(u8::max_value() as usize) * 2].clone()) + .recover_fragment(raw_fragments[(u8::MAX as usize) * 2].clone()) .unwrap() ) .is_none()); @@ -822,11 +822,7 @@ mod message_reconstructor { .collect(); // note that first set is not fully inserted - for raw_fragment in raw_fragments - .iter() - .skip(1) - .take(u8::max_value() as usize * 2 - 1) - { + for raw_fragment in raw_fragments.iter().skip(1).take(u8::MAX as usize * 2 - 1) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -839,7 +835,7 @@ mod message_reconstructor { assert!(reconstructor .insert_new_fragment( reconstructor - .recover_fragment(raw_fragments[(u8::max_value() as usize) * 2].clone()) + .recover_fragment(raw_fragments[(u8::MAX as usize) * 2].clone()) .unwrap() ) .is_none()); @@ -896,7 +892,7 @@ mod message_reconstructor { .collect(); // note that first set is not fully inserted - for raw_fragment in raw_fragments1.iter().take(u8::max_value() as usize - 1) { + for raw_fragment in raw_fragments1.iter().take(u8::MAX as usize - 1) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -930,7 +926,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments2.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments2.iter().take(u8::MAX as usize) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -970,7 +966,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) { assert!(reconstructor .insert_new_fragment( reconstructor @@ -1252,7 +1248,7 @@ mod message_reconstructor { // // we're inserting this via the buffer approach as not to trigger immediate re-assembly let mut reconstructor = MessageReconstructor::default(); - let mut set_buf1 = ReconstructionBuffer::new(u8::max_value()); + let mut set_buf1 = ReconstructionBuffer::new(u8::MAX); let mut set_buf2 = ReconstructionBuffer::new(1); let mut rng = thread_rng(); @@ -1267,7 +1263,7 @@ mod message_reconstructor { .map(|x| x.into_bytes()) .collect(); - for raw_fragment in raw_fragments.iter().take(u8::max_value() as usize) { + for raw_fragment in raw_fragments.iter().take(u8::MAX as usize) { set_buf1.insert_fragment(Fragment::try_from_bytes(raw_fragment).unwrap()); } @@ -1630,19 +1626,19 @@ mod message_reconstruction { .into_iter() .flat_map(|fragment_set| fragment_set.into_iter()) .collect(); - assert_eq!(fragments1.len(), u8::max_value() as usize); + assert_eq!(fragments1.len(), u8::MAX as usize); let mut fragments2: Vec<_> = crate::split_into_sets(&mut rand::rngs::OsRng, &message2, AVAILABLE_PLAINTEXT_SIZE) .into_iter() .flat_map(|fragment_set| fragment_set.into_iter()) .collect(); - assert_eq!(fragments2.len(), u8::max_value() as usize); + assert_eq!(fragments2.len(), u8::MAX as usize); // combine and shuffle fragments fragments1.append(fragments2.as_mut()); fragments1.shuffle(&mut rng); let fragments = fragments1; - assert_eq!(fragments.len(), (u8::max_value() as usize) * 2); + assert_eq!(fragments.len(), (u8::MAX as usize) * 2); let mut message_reconstructor = MessageReconstructor::default(); for fragment in fragments.into_iter() { @@ -1762,7 +1758,7 @@ mod message_reconstruction { .flat_map(|fragment_set| fragment_set.into_iter()) .map(|x| x.into_bytes()) .collect(); - assert_eq!(fragments.len(), 4 * (u8::max_value() as usize)); + assert_eq!(fragments.len(), 4 * (u8::MAX as usize)); // shuffle the fragments fragments.shuffle(&mut rng); @@ -1811,19 +1807,19 @@ mod message_reconstruction { .into_iter() .flat_map(|fragment_set| fragment_set.into_iter()) .collect(); - assert_eq!(fragments1.len(), 4 * (u8::max_value() as usize)); + assert_eq!(fragments1.len(), 4 * (u8::MAX as usize)); let mut fragments2: Vec<_> = crate::split_into_sets(&mut rand::rngs::OsRng, &message2, AVAILABLE_PLAINTEXT_SIZE) .into_iter() .flat_map(|fragment_set| fragment_set.into_iter()) .collect(); - assert_eq!(fragments2.len(), 4 * (u8::max_value() as usize)); + assert_eq!(fragments2.len(), 4 * (u8::MAX as usize)); // combine and shuffle fragments fragments1.append(fragments2.as_mut()); fragments1.shuffle(&mut rng); let fragments = fragments1; - assert_eq!(fragments.len(), (u8::max_value() as usize) * 8); + assert_eq!(fragments.len(), (u8::MAX as usize) * 8); let mut message_reconstructor = MessageReconstructor::default(); for fragment in fragments.into_iter() { diff --git a/common/nymsphinx/chunking/src/set.rs b/common/nymsphinx/chunking/src/set.rs index be5ae739da..6aa492af46 100644 --- a/common/nymsphinx/chunking/src/set.rs +++ b/common/nymsphinx/chunking/src/set.rs @@ -11,7 +11,7 @@ use rand::Rng; /// on its payload length of the maximum number of `Fragment`s multiplied by their maximum, /// fragmented, length. pub const fn max_unlinked_set_payload_length(max_plaintext_size: usize) -> usize { - u8::max_value() as usize * unlinked_fragment_payload_max_len(max_plaintext_size) + u8::MAX as usize * unlinked_fragment_payload_max_len(max_plaintext_size) } /// If the set is being linked to another one, by either being the very first set, or the very last, @@ -52,8 +52,8 @@ pub const fn two_way_linked_set_payload_length(max_plaintext_size: usize) -> usi pub(crate) type FragmentSet = Vec; /// Generate a pseudo-random id for a `FragmentSet`. -/// Its value is restricted to (0, i32::max_value()]. -/// Note that it *excludes* 0, but *includes* i32::max_value(). +/// Its value is restricted to (0, i32::MAX]. +/// Note that it *excludes* 0, but *includes* i32::MAX. /// This particular range allows for the id to be represented using 31bits, rather than /// the full length of 32 while still providing more than enough variability to /// distinguish different `FragmentSet`s. @@ -89,13 +89,13 @@ fn prepare_unlinked_fragmented_set( / unlinked_fragment_payload_max_len(max_plaintext_size) as f64) .ceil() as usize; - debug_assert!(pre_casted_frags <= u8::max_value() as usize); + debug_assert!(pre_casted_frags <= u8::MAX as usize); let num_fragments = pre_casted_frags as u8; let mut fragments = Vec::with_capacity(num_fragments as usize); for i in 1..(pre_casted_frags + 1) { - // we can't use u8 directly here as upper (NON-INCLUSIVE, so it would always fit) bound could be u8::max_value() + 1 + // we can't use u8 directly here as upper (NON-INCLUSIVE, so it would always fit) bound could be u8::MAX + 1 let lb = (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size); let ub = usize::min( message.len(), @@ -131,7 +131,7 @@ fn prepare_linked_fragment_set( ) -> FragmentSet { // determine number of fragments in the set: let num_frags_usize = if next_link_id.is_some() { - u8::max_value() as usize + u8::MAX as usize } else { // we know this set is linked, if it's not post-linked then it MUST BE pre-linked let tail_len = if message.len() >= linked_fragment_payload_max_len(max_plaintext_size) { @@ -142,7 +142,7 @@ fn prepare_linked_fragment_set( let pre_casted_frags = 1 + (tail_len as f64 / unlinked_fragment_payload_max_len(max_plaintext_size) as f64) .ceil() as usize; - if pre_casted_frags > u8::max_value() as usize { + if pre_casted_frags > u8::MAX as usize { panic!("message would produce too many fragments!") }; pre_casted_frags @@ -162,7 +162,7 @@ fn prepare_linked_fragment_set( let mut fragments = Vec::with_capacity(num_frags_usize); for i in 1..(num_frags_usize + 1) { - // we can't use u8 directly here as upper (NON-INCLUSIVE, so i would always fit) bound could be u8::max_value() + 1 + // we can't use u8 directly here as upper (NON-INCLUSIVE, so i would always fit) bound could be u8::MAX + 1 let fragment = Fragment::try_new( &message[lb..ub], id, @@ -343,7 +343,7 @@ mod tests { fn verify_post_linked_set_payload(mut set: FragmentSet, payload: &[u8]) { for i in (0..set.len()).rev() { let lb = i * unlinked_fragment_payload_max_len(max_plaintext_size()); - let ub = if i == (u8::max_value() as usize - 1) { + let ub = if i == (u8::MAX as usize - 1) { i * unlinked_fragment_payload_max_len(max_plaintext_size()) + linked_fragment_payload_max_len(max_plaintext_size()) } else { @@ -365,7 +365,7 @@ mod tests { (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size()) + linked_fragment_payload_max_len(max_plaintext_size()) }; - let ub = if i == (u8::max_value() as usize - 1) { + let ub = if i == (u8::MAX as usize - 1) { (i - 1) * unlinked_fragment_payload_max_len(max_plaintext_size()) + 2 * linked_fragment_payload_max_len(max_plaintext_size()) } else { @@ -434,7 +434,7 @@ mod tests { id, max_plaintext_size(), ); - assert_eq!(u8::max_value() as usize, max_fragment_set.len()); + assert_eq!(u8::MAX as usize, max_fragment_set.len()); verify_unlinked_set_payload(max_fragment_set, &max_fragments_set_payload); let mut full_set_payload = @@ -442,7 +442,7 @@ mod tests { rng.fill_bytes(&mut full_set_payload); let full_fragment_set = prepare_unlinked_fragmented_set(&full_set_payload, id, max_plaintext_size()); - assert_eq!(u8::max_value() as usize, full_fragment_set.len()); + assert_eq!(u8::MAX as usize, full_fragment_set.len()); verify_unlinked_set_payload(full_fragment_set, &full_set_payload); } @@ -515,7 +515,7 @@ mod tests { None, max_plaintext_size(), ); - assert_eq!(u8::max_value() as usize, max_fragment_set.len()); + assert_eq!(u8::MAX as usize, max_fragment_set.len()); verify_pre_linked_set_payload(max_fragment_set, &max_fragments_set_payload); let mut full_set_payload = @@ -528,7 +528,7 @@ mod tests { None, max_plaintext_size(), ); - assert_eq!(u8::max_value() as usize, full_fragment_set.len()); + assert_eq!(u8::MAX as usize, full_fragment_set.len()); verify_pre_linked_set_payload(full_fragment_set, &full_set_payload); } @@ -561,7 +561,7 @@ mod tests { Some(link_id), max_plaintext_size(), ); - assert_eq!(u8::max_value() as usize, full_fragment_set.len()); + assert_eq!(u8::MAX as usize, full_fragment_set.len()); verify_post_linked_set_payload(full_fragment_set, &full_set_payload); } @@ -608,7 +608,7 @@ mod tests { Some(post_link_id), max_plaintext_size(), ); - assert_eq!(u8::max_value() as usize, full_fragment_set.len()); + assert_eq!(u8::MAX as usize, full_fragment_set.len()); verify_two_way_linked_set_payload(full_fragment_set, &full_set_payload); } @@ -700,8 +700,8 @@ mod tests { let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size()); assert_eq!(2, sets.len()); - assert_eq!(sets[0].len(), u8::max_value() as usize); - assert_eq!(sets[1].len(), u8::max_value() as usize); + assert_eq!(sets[0].len(), u8::MAX as usize); + assert_eq!(sets[1].len(), u8::MAX as usize); verify_correct_link(&sets[0], &sets[1]); verify_pre_linked_set_payload( sets.pop().unwrap(), @@ -726,9 +726,9 @@ mod tests { rng.fill_bytes(&mut message); let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size()); assert_eq!(4, sets.len()); - assert_eq!(sets[0].len(), u8::max_value() as usize); - assert_eq!(sets[1].len(), u8::max_value() as usize); - assert_eq!(sets[2].len(), u8::max_value() as usize); + assert_eq!(sets[0].len(), u8::MAX as usize); + assert_eq!(sets[1].len(), u8::MAX as usize); + assert_eq!(sets[2].len(), u8::MAX as usize); verify_correct_link(&sets[0], &sets[1]); verify_correct_link(&sets[1], &sets[2]); @@ -766,10 +766,10 @@ mod tests { let mut sets = split_into_sets(&mut rng, &message, max_plaintext_size()); assert_eq!(4, sets.len()); - assert_eq!(sets[0].len(), u8::max_value() as usize); - assert_eq!(sets[1].len(), u8::max_value() as usize); - assert_eq!(sets[2].len(), u8::max_value() as usize); - assert_eq!(sets[3].len(), u8::max_value() as usize); + assert_eq!(sets[0].len(), u8::MAX as usize); + assert_eq!(sets[1].len(), u8::MAX as usize); + assert_eq!(sets[2].len(), u8::MAX as usize); + assert_eq!(sets[3].len(), u8::MAX as usize); verify_correct_link(&sets[0], &sets[1]); verify_correct_link(&sets[1], &sets[2]); diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 83c95bd9d7..c1440b1c6f 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -81,12 +81,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "blake2" version = "0.8.1" @@ -157,13 +151,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "cc" -version = "1.0.94" +name = "camino" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ - "jobserver", - "libc", + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -558,6 +574,7 @@ dependencies = [ "cw3-fixed-multisig", "cw4", "cw4-group", + "nym-contracts-common", "nym-group-contract-common", "nym-multisig-contract-common", ] @@ -586,6 +603,7 @@ dependencies = [ "cw-utils", "cw2", "cw4", + "nym-contracts-common", "nym-group-contract-common", "schemars", "serde", @@ -779,26 +797,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-iterator" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a0ac4aeb3a18f92eaf09c6bb9b3ac30ff61ca95514fc58cbead1c9a6bf5401" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.59", -] - [[package]] name = "ff" version = "0.12.1" @@ -825,15 +823,6 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "forward_ref" version = "1.0.0" @@ -871,31 +860,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "git2" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - [[package]] name = "group" version = "0.12.1" @@ -967,16 +931,6 @@ dependencies = [ "serde", ] -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "inout" version = "0.1.3" @@ -1001,15 +955,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jobserver" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" -dependencies = [ - "libc", -] - [[package]] name = "k256" version = "0.11.6" @@ -1048,36 +993,12 @@ version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -[[package]] -name = "libgit2-sys" -version = "0.13.5+1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e5ea06c26926f1002dd553fded6cfcdc9784c1f60feeb58368b4d9b07b6dba" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - [[package]] name = "libm" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libz-sys" -version = "1.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "lioness" version = "0.1.2" @@ -1134,6 +1055,15 @@ dependencies = [ "libm", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "nym-coconut-bandwidth" version = "0.1.0" @@ -1173,8 +1103,8 @@ dependencies = [ "cw4", "cw4-group", "nym-coconut-dkg-common", + "nym-contracts-common", "nym-group-contract-common", - "semver", "serde", "thiserror", ] @@ -1199,9 +1129,11 @@ dependencies = [ "bs58 0.5.1", "cosmwasm-schema", "cosmwasm-std", + "cw-storage-plus", "schemars", "serde", "thiserror", + "vergen", ] [[package]] @@ -1246,11 +1178,9 @@ dependencies = [ "nym-mixnet-contract-common", "nym-vesting-contract-common", "rand_chacha", - "semver", "serde", "thiserror", "time", - "vergen", ] [[package]] @@ -1318,11 +1248,9 @@ dependencies = [ "nym-mixnet-contract-common", "nym-vesting-contract-common", "rand_chacha", - "semver", "serde", "serde_json", "thiserror", - "vergen", ] [[package]] @@ -1367,12 +1295,6 @@ dependencies = [ "regex", ] -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - [[package]] name = "pkcs8" version = "0.9.0" @@ -1393,12 +1315,6 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - [[package]] name = "platforms" version = "3.4.0" @@ -1417,30 +1333,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[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", - "syn 1.0.109", - "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-macro2" version = "1.0.81" @@ -1656,6 +1548,9 @@ name = "semver" version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +dependencies = [ + "serde", +] [[package]] name = "serde" @@ -1879,7 +1774,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", @@ -1923,58 +1820,24 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "vergen" -version = "7.4.3" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f9238a4553957277b3ee09d80babeae0811f1b3baefb093de1c0448437a37" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", + "cargo_metadata", "cfg-if", - "enum-iterator", - "getset", - "git2", + "regex", "rustc_version", "rustversion", - "thiserror", "time", ] diff --git a/explorer-api/src/service_providers/http.rs b/explorer-api/src/service_providers/http.rs index a942a68755..ae7fd80e34 100644 --- a/explorer-api/src/service_providers/http.rs +++ b/explorer-api/src/service_providers/http.rs @@ -15,7 +15,9 @@ const HM_SIZE: u8 = 100; #[derive(Debug)] pub enum GetSpError { + #[allow(dead_code)] ReqwestError(ReqwestError), + #[allow(dead_code)] Error(String), } diff --git a/nym-api/src/support/storage/models.rs b/nym-api/src/support/storage/models.rs index cc3f11ce26..f48f2187f1 100644 --- a/nym-api/src/support/storage/models.rs +++ b/nym-api/src/support/storage/models.rs @@ -84,7 +84,9 @@ impl From for TestNode { pub struct TestedMixnodeStatus { pub db_id: i64, + #[allow(dead_code)] pub mix_id: i64, + #[allow(dead_code)] pub identity_key: String, pub reliability: Option, pub timestamp: i64, @@ -98,6 +100,7 @@ pub struct TestedMixnodeStatus { pub struct TestedGatewayStatus { pub db_id: i64, + #[allow(dead_code)] pub identity_key: String, pub reliability: Option, pub timestamp: i64, diff --git a/nym-outfox/src/format.rs b/nym-outfox/src/format.rs index b6a7db01f4..9dc9be9e48 100644 --- a/nym-outfox/src/format.rs +++ b/nym-outfox/src/format.rs @@ -64,7 +64,6 @@ use curve25519_dalek::montgomery::MontgomeryPoint; use curve25519_dalek::scalar::Scalar; use std::ops::Range; -use std::u8; use crate::constants::groupelementbytes; use crate::constants::tagbytes; diff --git a/nym-wallet/Cargo.lock b/nym-wallet/Cargo.lock index 940b8a632c..9f5114227c 100644 --- a/nym-wallet/Cargo.lock +++ b/nym-wallet/Cargo.lock @@ -293,8 +293,6 @@ dependencies = [ "bs58 0.5.1", "hmac", "k256", - "once_cell", - "pbkdf2", "rand_core 0.6.4", "ripemd", "sha2 0.10.8", @@ -515,6 +513,38 @@ dependencies = [ "system-deps 6.1.1", ] +[[package]] +name = "camino" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.22", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "cargo_toml" version = "0.13.3" @@ -1606,7 +1636,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec", "rand_core 0.6.4", "subtle 2.5.0", ] @@ -3164,9 +3193,11 @@ dependencies = [ "bs58 0.5.1", "cosmwasm-schema", "cosmwasm-std", + "cw-storage-plus", "schemars", "serde", "thiserror", + "vergen", ] [[package]] @@ -3748,16 +3779,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", - "hmac", -] - [[package]] name = "peg" version = "0.7.0" @@ -6106,11 +6127,14 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.2.6" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1290fd64cc4e7d3c9b07d7f333ce0ce0007253e32870e632624835cc80b83939" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", + "cargo_metadata", + "cfg-if", + "regex", "rustc_version", "rustversion", "time", diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs index 6d4533e6c4..01c395365c 100644 --- a/service-providers/network-requester/src/core.rs +++ b/service-providers/network-requester/src/core.rs @@ -51,6 +51,7 @@ pub(crate) fn new_legacy_request_version() -> RequestVersion { } } +#[allow(dead_code)] pub struct OnStartData { // to add more fields as required pub address: Recipient, diff --git a/wasm/mix-fetch/src/harbourmaster.rs b/wasm/mix-fetch/src/harbourmaster.rs index cf09dc467f..7b525384ba 100644 --- a/wasm/mix-fetch/src/harbourmaster.rs +++ b/wasm/mix-fetch/src/harbourmaster.rs @@ -38,6 +38,7 @@ pub trait HarbourMasterApiClientExt: ApiClient { impl HarbourMasterApiClientExt for Client {} // https://gitlab.nymte.ch/nym/shipyard-test-and-earn/-/blob/main/harbour-master/src/http/mod.rs#L13 +#[allow(dead_code)] #[derive(Debug, Deserialize)] pub struct PagedResult { pub page: u32, @@ -47,6 +48,7 @@ pub struct PagedResult { } // https://gitlab.nymte.ch/nym/shipyard-test-and-earn/-/blob/main/harbour-master/src/http/services.rs#L32 +#[allow(dead_code)] #[derive(Debug, Deserialize)] pub struct ServiceNew { pub service_provider_client_id: String,