Lint fixes for new lints in cargo 1.75 (#293)

Our CI just updated I think since PRs from a day ago didn't trip this
but they do now.

chain/rust/src/byron/base58.rs

@@ -36,72 +36,6 @@ pub fn decode(input: &str) -> Result<Vec<u8>> {
 //    base_decode(ALPHABET, input)
 //}
 
-#[cfg(test)]
-mod tests {
-    fn encode(input: &[u8], expected: &str) {
-        let encoded = super::encode(input);
-        assert_eq!(encoded, expected);
-    }
-    fn decode(expected: &[u8], input: &str) {
-        let decoded = super::decode(input).unwrap();
-        assert_eq!(decoded.as_slice(), expected);
-    }
-
-    #[test]
-    fn test_vector_1() {
-        encode(b"\0\0\0\0", "11111");
-        decode(b"\0\0\0\0", "11111");
-    }
-
-    #[test]
-    fn test_vector_2() {
-        encode(b"This is awesome!", "BRY7dK2V98Sgi7CFWiZbap");
-        decode(b"This is awesome!", "BRY7dK2V98Sgi7CFWiZbap");
-    }
-
-    #[test]
-    fn test_vector_3() {
-        encode(b"Hello World...", "TcgsE5dzphUWfjcb9i5");
-        decode(b"Hello World...", "TcgsE5dzphUWfjcb9i5");
-    }
-
-    #[test]
-    fn test_vector_4() {
-        encode(b"\0abc", "1ZiCa");
-        decode(b"\0abc", "1ZiCa");
-    }
-
-    #[test]
-    fn test_vector_5() {
-        encode(b"\0\0abc", "11ZiCa");
-        decode(b"\0\0abc", "11ZiCa");
-    }
-
-    #[test]
-    fn test_vector_6() {
-        encode(b"\0\0\0abc", "111ZiCa");
-        decode(b"\0\0\0abc", "111ZiCa");
-    }
-
-    #[test]
-    fn test_vector_7() {
-        encode(b"\0\0\0\0abc", "1111ZiCa");
-        decode(b"\0\0\0\0abc", "1111ZiCa");
-    }
-
-    #[test]
-    fn test_vector_8() {
-        encode(
-            b"abcdefghijklmnopqrstuvwxyz",
-            "3yxU3u1igY8WkgtjK92fbJQCd4BZiiT1v25f",
-        );
-        decode(
-            b"abcdefghijklmnopqrstuvwxyz",
-            "3yxU3u1igY8WkgtjK92fbJQCd4BZiiT1v25f",
-        );
-    }
-}
-
 fn base_encode(alphabet_s: &str, input: &[u8]) -> Vec<u8> {
     let alphabet = alphabet_s.as_bytes();
     let base = alphabet.len() as u32;
@@ -171,3 +105,69 @@ fn base_decode(alphabet_s: &str, input: &[u8]) -> Result<Vec<u8>> {
     bytes.reverse();
     Ok(bytes)
 }
+
+#[cfg(test)]
+mod tests {
+    fn encode(input: &[u8], expected: &str) {
+        let encoded = super::encode(input);
+        assert_eq!(encoded, expected);
+    }
+    fn decode(expected: &[u8], input: &str) {
+        let decoded = super::decode(input).unwrap();
+        assert_eq!(decoded.as_slice(), expected);
+    }
+
+    #[test]
+    fn test_vector_1() {
+        encode(b"\0\0\0\0", "11111");
+        decode(b"\0\0\0\0", "11111");
+    }
+
+    #[test]
+    fn test_vector_2() {
+        encode(b"This is awesome!", "BRY7dK2V98Sgi7CFWiZbap");
+        decode(b"This is awesome!", "BRY7dK2V98Sgi7CFWiZbap");
+    }
+
+    #[test]
+    fn test_vector_3() {
+        encode(b"Hello World...", "TcgsE5dzphUWfjcb9i5");
+        decode(b"Hello World...", "TcgsE5dzphUWfjcb9i5");
+    }
+
+    #[test]
+    fn test_vector_4() {
+        encode(b"\0abc", "1ZiCa");
+        decode(b"\0abc", "1ZiCa");
+    }
+
+    #[test]
+    fn test_vector_5() {
+        encode(b"\0\0abc", "11ZiCa");
+        decode(b"\0\0abc", "11ZiCa");
+    }
+
+    #[test]
+    fn test_vector_6() {
+        encode(b"\0\0\0abc", "111ZiCa");
+        decode(b"\0\0\0abc", "111ZiCa");
+    }
+
+    #[test]
+    fn test_vector_7() {
+        encode(b"\0\0\0\0abc", "1111ZiCa");
+        decode(b"\0\0\0\0abc", "1111ZiCa");
+    }
+
+    #[test]
+    fn test_vector_8() {
+        encode(
+            b"abcdefghijklmnopqrstuvwxyz",
+            "3yxU3u1igY8WkgtjK92fbJQCd4BZiiT1v25f",
+        );
+        decode(
+            b"abcdefghijklmnopqrstuvwxyz",
+            "3yxU3u1igY8WkgtjK92fbJQCd4BZiiT1v25f",
+        );
+    }
+}

chain/rust/src/byron/utils.rs

@@ -15,10 +15,7 @@ use cml_crypto::{
     impl_hash_type, Bip32PrivateKey, Bip32PublicKey, CryptoError, Ed25519Signature,
     LegacyDaedalusPrivateKey, PublicKey, RawBytesEncoding, TransactionHash,
 };
-use std::{
-    convert::{TryFrom, TryInto},
-    fmt,
-};
+use std::{convert::TryFrom, fmt};
 
 #[derive(Debug, thiserror::Error)]
 pub enum ByronAddressError {
@@ -40,7 +37,7 @@ impl StakeholderId {
         let buf = cbor!(pubk.0.as_ref()).unwrap();
 
         let hash = Sha3_256::new(&buf);
-        StakeholderId(Blake2b224::new(hash.as_ref()).try_into().unwrap())
+        StakeholderId(Blake2b224::new(hash.as_ref()).into())
     }
 }
 

chain/rust/src/lib.rs

@@ -8,7 +8,7 @@
 // possibly impacting PartialOrd performance on top of being unnecessary and occuring in generated code.
 // Possibly the derivative crate could get updated to suppress this lint
 // from within their proc macros itself. Issue: https://github.com/mcarton/rust-derivative/issues/115
-#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+#![allow(clippy::non_canonical_partial_ord_impl)]
 
 pub mod address;
 pub mod assets;

cip25/rust/src/utils.rs

@@ -7,7 +7,6 @@ pub use cml_core::{
     metadata::{Metadata, TransactionMetadatum},
     serialization::*,
 };
-pub use cml_core::{error::*, serialization::*};
 use cml_crypto::RawBytesEncoding;
 use std::io::{BufRead, Seek, SeekFrom, Write};
 

core/rust/src/lib.rs

@@ -8,7 +8,7 @@
 // possibly impacting PartialOrd performance on top of being unnecessary and occuring in generated code.
 // Possibly the derivative crate could get updated to suppress this lint
 // from within their proc macros itself. Issue: https://github.com/mcarton/rust-derivative/issues/115
-#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+#![allow(clippy::non_canonical_partial_ord_impl)]
 
 pub use error::*;
 

crypto/rust/src/chain_crypto/sign.rs

@@ -215,43 +215,6 @@ impl<T, A: VerificationAlgorithm> std::cmp::PartialEq<Self> for Signature<T, A>
 
 impl<T, A: VerificationAlgorithm> std::cmp::Eq for Signature<T, A> {}
 
-#[cfg(test)]
-pub(crate) mod test {
-    use super::*;
-    use crate::chain_crypto::key::{AsymmetricKey, KeyPair};
-
-    pub(crate) fn keypair_signing_ok<A: AsymmetricKey + SigningAlgorithm>(
-        input: (KeyPair<A>, Vec<u8>),
-    ) -> bool
-    where
-        <A as AsymmetricKey>::PubAlg: VerificationAlgorithm,
-    {
-        let (sk, pk) = input.0.into_keys();
-        let data = input.1;
-
-        let signature = sk.sign(&data);
-        signature.verify(&pk, &data) == Verification::Success
-    }
-
-    pub(crate) fn keypair_signing_ko<A: AsymmetricKey + SigningAlgorithm>(
-        input: (KeyPair<A>, KeyPair<A>, Vec<u8>),
-    ) -> bool
-    where
-        <A as AsymmetricKey>::PubAlg: VerificationAlgorithm,
-    {
-        let (sk, pk) = input.0.into_keys();
-        let pk_random = input.1.public_key();
-        let data = input.2;
-
-        if &pk == pk_random {
-            return true;
-        }
-
-        let signature = sk.sign(&data);
-        signature.verify(pk_random, &data) == Verification::Failed
-    }
-}
-
 impl<U, A: VerificationAlgorithm> cbor_event::se::Serialize for Signature<U, A> {
     fn serialize<'se, W: std::io::Write>(
         &self,
@@ -292,3 +255,40 @@ impl<'de, U, A: VerificationAlgorithm> serde::de::Deserialize<'de> for Signature
         })
     }
 }
+
+#[cfg(test)]
+pub(crate) mod test {
+    use super::*;
+    use crate::chain_crypto::key::{AsymmetricKey, KeyPair};
+
+    pub(crate) fn keypair_signing_ok<A: AsymmetricKey + SigningAlgorithm>(
+        input: (KeyPair<A>, Vec<u8>),
+    ) -> bool
+    where
+        <A as AsymmetricKey>::PubAlg: VerificationAlgorithm,
+    {
+        let (sk, pk) = input.0.into_keys();
+        let data = input.1;
+
+        let signature = sk.sign(&data);
+        signature.verify(&pk, &data) == Verification::Success
+    }
+
+    pub(crate) fn keypair_signing_ko<A: AsymmetricKey + SigningAlgorithm>(
+        input: (KeyPair<A>, KeyPair<A>, Vec<u8>),
+    ) -> bool
+    where
+        <A as AsymmetricKey>::PubAlg: VerificationAlgorithm,
+    {
+        let (sk, pk) = input.0.into_keys();
+        let pk_random = input.1.public_key();
+        let data = input.2;
+
+        if &pk == pk_random {
+            return true;
+        }
+
+        let signature = sk.sign(&data);
+        signature.verify(pk_random, &data) == Verification::Failed
+    }
+}