Fix warnings in the tests

Author: stanislav-tkach

rust/rbac-registration/src/cardano/cip509/cip509.rs

@@ -547,11 +547,11 @@ fn decode_validation_signature(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::utils::test::test_block_1;
+    use crate::utils::test;
 
     #[test]
     fn new() {
-        let block = test_block_1();
+        let block = test::block_1();
         let index = TxnIndex::from(3);
         let res = Cip509::new(&block, index, &[])
             .expect("Failed to get Cip509")
@@ -561,7 +561,7 @@ mod tests {
 
     #[test]
     fn from_block() {
-        let block = test_block_1();
+        let block = test::block_1();
         let res = Cip509::from_block(&block, &[]);
         assert_eq!(1, res.len());
         let cip509 = res.first().unwrap();

rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs

@@ -262,11 +262,11 @@ fn extract_c509_uris(certificates: &[C509Cert], report: &ProblemReport) -> UrisM
 mod tests {
     use pallas::ledger::addresses::{Address, Network};
 
-    use crate::{cardano::cip509::Cip509, utils::test::test_block_1};
+    use crate::{cardano::cip509::Cip509, utils::test};
 
     #[test]
     fn set_new() {
-        let block = test_block_1();
+        let block = test::block_1();
         let cip509 = Cip509::new(&block, 3.into(), &[]).unwrap().unwrap();
         assert!(
             !cip509.report().is_problematic(),

rust/rbac-registration/src/cardano/cip509/validation.rs

@@ -207,14 +207,11 @@ mod tests {
     use uuid::Uuid;
 
     use super::*;
-    use crate::{
-        cardano::cip509::Cip509,
-        utils::test::{test_block_1, test_block_2, test_block_3, test_block_4},
-    };
+    use crate::{cardano::cip509::Cip509, utils::test};
 
     #[test]
     fn block_1() {
-        let block = test_block_1();
+        let block = test::block_1();
 
         let mut registrations = Cip509::from_block(&block, &[]);
         assert_eq!(1, registrations.len());
@@ -241,7 +238,7 @@ mod tests {
 
     #[test]
     fn block_2() {
-        let block = test_block_2();
+        let block = test::block_2();
 
         let mut registrations = Cip509::from_block(&block, &[]);
         assert_eq!(1, registrations.len());
@@ -262,7 +259,7 @@ mod tests {
 
     #[test]
     fn block_3() {
-        let block = test_block_3();
+        let block = test::block_3();
 
         let mut registrations = Cip509::from_block(&block, &[]);
         assert_eq!(1, registrations.len());
@@ -297,7 +294,7 @@ mod tests {
 
     #[test]
     fn block_4() {
-        let block = test_block_4();
+        let block = test::block_4();
 
         let mut registrations = Cip509::from_block(&block, &[]);
         assert_eq!(1, registrations.len());
@@ -332,7 +329,7 @@ mod tests {
 
     #[test]
     fn extract_stake_addresses_from_metadata() {
-        let block = test_block_1();
+        let block = test::block_1();
         let cip509 = Cip509::new(&block, 3.into(), &[]).unwrap().unwrap();
         assert!(
             !cip509.report().is_problematic(),

rust/rbac-registration/src/cardano/cip509/x509_chunks.rs

@@ -116,7 +116,7 @@ mod tests {
     use pallas::ledger::traverse::MultiEraTx;
 
     use super::*;
-    use crate::{cardano::cip509::PointTxnIdx, utils::test::test_block_3};
+    use crate::{cardano::cip509::PointTxnIdx, utils::test};
 
     // RAW data: 10
     const RAW: &str =
@@ -135,7 +135,7 @@ mod tests {
         let mut report = ProblemReport::new("X509Chunks");
         // We don't care about actual values in the context, all we want is to check the decoding
         // of differently compressed data.
-        let block = test_block_3();
+        let block = test::block_3();
         let transactions = block.txs();
         let MultiEraTx::Conway(txn) = transactions.first().unwrap() else {
             panic!("Unexpected transaction type");
@@ -168,7 +168,7 @@ mod tests {
         let mut report = ProblemReport::new("X509Chunks");
         // We don't care about actual values in the context, all we want is to check the decoding
         // of differently compressed data.
-        let block = test_block_3();
+        let block = test::block_3();
         let transactions = block.txs();
         let MultiEraTx::Conway(txn) = transactions.first().unwrap() else {
             panic!("Unexpected transaction type");
@@ -201,7 +201,7 @@ mod tests {
         let mut report = ProblemReport::new("X509Chunks");
         // We don't care about actual values in the context, all we want is to check the decoding
         // of differently compressed data.
-        let block = test_block_3();
+        let block = test::block_3();
         let transactions = block.txs();
         let MultiEraTx::Conway(txn) = transactions.first().unwrap() else {
             panic!("Unexpected transaction type");

rust/rbac-registration/src/registration/cardano/mod.rs

@@ -411,11 +411,11 @@ fn update_role_data(
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::utils::test::{test_block_1, test_block_2, test_block_4};
+    use crate::utils::test;
 
     #[test]
     fn multiple_registrations() {
-        let block = test_block_1();
+        let block = test::block_1();
         let registration = Cip509::new(&block, 3.into(), &[]).unwrap().unwrap();
         assert!(
             !registration.report().is_problematic(),
@@ -431,11 +431,11 @@ mod test {
         .unwrap()]);
         assert_eq!(1, chain.x509_certs().len());
         let origin = &chain.x509_certs().get(&0).unwrap().0;
-        assert_eq!(origin.point().slot_or_default(), 77429134.into());
+        assert_eq!(origin.point().slot_or_default(), 77_429_134.into());
         assert_eq!(origin.txn_index(), 3.into());
 
         // Try to add an invalid registration.
-        let block = test_block_2();
+        let block = test::block_2();
         let registration = Cip509::new(&block, 0.into(), &[]).unwrap().unwrap();
         assert!(registration.report().is_problematic());
 
@@ -448,7 +448,7 @@ mod test {
         );
 
         // Add the second registration.
-        let block = test_block_4();
+        let block = test::block_4();
         let registration = Cip509::new(&block, 1.into(), &[]).unwrap().unwrap();
         assert!(
             !registration.report().is_problematic(),

rust/rbac-registration/src/utils/test.rs

@@ -4,29 +4,29 @@ use cardano_blockchain_types::{MultiEraBlock, Network, Point};
 
 /// Returns the decoded `conway_1.block` block that contains one transaction (index = 3)
 /// with the `Cip509` data.
-pub fn test_block_1() -> MultiEraBlock {
+pub fn block_1() -> MultiEraBlock {
     let data = hex::decode(include_str!("../test_data/cardano/conway_1.block")).unwrap();
     block(data)
 }
 
 /// Returns the decoded `conway_2.block` block that  contains one transaction (index = 0).
 /// This registration contains an invalid public key that isn't present in the transaction
 /// witness set.
-pub fn test_block_2() -> MultiEraBlock {
+pub fn block_2() -> MultiEraBlock {
     let data = hex::decode(include_str!("../test_data/cardano/conway_2.block")).unwrap();
     block(data)
 }
 
 /// Returns the decoded `conway_3.block` block that contains one transaction (index = 0)
 /// with the `Cip509` data.
-pub fn test_block_3() -> MultiEraBlock {
+pub fn block_3() -> MultiEraBlock {
     let data = hex::decode(include_str!("../test_data/cardano/conway_3.block")).unwrap();
     block(data)
 }
 
 /// Returns the decoded `conway_4.block` block that contains one transaction (index = 1)
 /// with the `Cip509` data.
-pub fn test_block_4() -> MultiEraBlock {
+pub fn block_4() -> MultiEraBlock {
     let data = hex::decode(include_str!("../test_data/cardano/conway_4.block")).unwrap();
     block(data)
 }