Use the 'cbork-utils' crate

Author: stanislav-tkach

rust/rbac-registration/Cargo.toml

@@ -36,3 +36,4 @@ c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-h
 pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 cardano-blockchain-types = { version = "0.0.1", path = "../cardano-blockchain-types" }
 catalyst-types = { version = "0.0.1", path = "../catalyst-types" }
+cbork-utils = { version = "0.0.1", path = "../cbork-utils" }

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

@@ -10,6 +10,7 @@ use cardano_blockchain_types::{
     MultiEraBlock, TxnIndex,
 };
 use catalyst_types::problem_report::ProblemReport;
+use cbork_utils::decode_helper::{decode_bytes, decode_helper, decode_map_len};
 use minicbor::{
     decode::{self},
     Decode, Decoder,
@@ -42,9 +43,7 @@ use crate::{
         },
         transaction::raw_aux_data::RawAuxData,
     },
-    utils::decode_helper::{
-        decode_bytes, decode_helper, decode_map_len, report_duplicated_key, report_missing_keys,
-    },
+    utils::decode_helper::{report_duplicated_key, report_missing_keys},
 };
 
 /// CIP509 label.

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

@@ -19,6 +19,6 @@ pub struct DecodeContext<'r, 't> {
     ///
     /// The reference must be mutable because the `Decode::decode` function takes a
     /// mutable reference to the context and sometimes we want to pass just the report
-    /// without th whole `DecodeContext`.
+    /// without whole `DecodeContext`.
     pub report: &'r mut ProblemReport,
 }

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

@@ -2,11 +2,11 @@
 
 use c509_certificate::c509::C509;
 use catalyst_types::problem_report::ProblemReport;
+use cbork_utils::decode_helper::{decode_array_len, decode_bytes, decode_helper, decode_tag};
 use minicbor::{decode, Decode, Decoder};
 use x509_cert::{der::Decode as x509Decode, Certificate};
 
 use super::tag::KeyTag;
-use crate::utils::decode_helper::{decode_array_len, decode_bytes, decode_helper, decode_tag};
 
 // ------------------x509------------------------
 

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

@@ -3,6 +3,9 @@
 use std::collections::{HashMap, HashSet};
 
 use catalyst_types::problem_report::ProblemReport;
+use cbork_utils::decode_helper::{
+    decode_any, decode_array_len, decode_bytes, decode_helper, decode_map_len,
+};
 use minicbor::{decode, Decode, Decoder};
 use strum_macros::FromRepr;
 
@@ -13,10 +16,7 @@ use crate::{
         utils::Cip0134UriSet,
         CertKeyHash, RoleData, RoleNumber,
     },
-    utils::decode_helper::{
-        decode_any, decode_array_len, decode_bytes, decode_helper, decode_map_len,
-        report_duplicated_key,
-    },
+    utils::decode_helper::report_duplicated_key,
 };
 
 /// Cip509 RBAC metadata.

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

@@ -1,11 +1,11 @@
 //! Public key type for RBAC metadata
 
 use catalyst_types::problem_report::ProblemReport;
+use cbork_utils::decode_helper::{decode_bytes, decode_tag};
 use ed25519_dalek::VerifyingKey;
 use minicbor::{decode, Decode, Decoder};
 
 use super::tag::KeyTag;
-use crate::utils::decode_helper::{decode_bytes, decode_tag};
 
 /// Enum of possible public key type.
 #[derive(Debug, PartialEq, Clone, Default)]

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

@@ -3,15 +3,13 @@
 use std::collections::HashMap;
 
 use catalyst_types::problem_report::ProblemReport;
+use cbork_utils::decode_helper::{decode_any, decode_array_len, decode_helper, decode_map_len};
 use minicbor::{decode, Decode, Decoder};
 use strum_macros::FromRepr;
 
 use crate::{
     cardano::cip509::{KeyLocalRef, RoleNumber},
-    utils::decode_helper::{
-        decode_any, decode_array_len, decode_helper, decode_map_len, report_duplicated_key,
-        report_missing_keys,
-    },
+    utils::decode_helper::{report_duplicated_key, report_missing_keys},
 };
 
 /// Role data as encoded in CBOR.

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

@@ -1,9 +1,10 @@
 //! A local key reference.
 
+use cbork_utils::decode_helper::decode_helper;
 use minicbor::{decode, Decode, Decoder};
 use strum_macros::FromRepr;
 
-use crate::{cardano::cip509::rbac::Cip509RbacMetadataInt, utils::decode_helper::decode_helper};
+use crate::cardano::cip509::rbac::Cip509RbacMetadataInt;
 
 /// Local key reference.
 #[derive(Debug, PartialEq, Clone)]

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

@@ -2,14 +2,12 @@
 
 use std::io::Read;
 
+use cbork_utils::decode_helper::{decode_array_len, decode_bytes, decode_helper};
 use minicbor::{decode, Decode, Decoder};
 use strum_macros::FromRepr;
 
 use super::rbac::Cip509RbacMetadata;
-use crate::{
-    cardano::cip509::decode_context::DecodeContext,
-    utils::decode_helper::{decode_array_len, decode_bytes, decode_helper},
-};
+use crate::cardano::cip509::decode_context::DecodeContext;
 
 /// Enum of compression algorithms used to compress chunks.
 #[derive(FromRepr, Debug, PartialEq, Clone, Default)]
@@ -119,14 +117,11 @@ mod tests {
     use crate::{cardano::cip509::PointTxnIdx, utils::test};
 
     // RAW data: 10
-    const RAW: &str =
-    "0a8c5840a30a815902ae308202aa3082025ca00302010202147735a70599e68b49554b1cb3a6cf5e34583b3c2f300506032b6570307c310b300906035504061302555331584013301106035504080c0a43616c69666f726e69613116301406035504070c0d53616e204672616e636973636f31123010060355040a0c094d79436f6d70616e79584031153013060355040b0c0c4d794465706172746d656e743115301306035504030c0c6d79646f6d61696e2e636f6d301e170d3234313132393034333134305a1758400d3235313132393034333134305a307c310b30090603550406130255533113301106035504080c0a43616c69666f726e69613116301406035504070c0d53616e5840204672616e636973636f31123010060355040a0c094d79436f6d70616e7931153013060355040b0c0c4d794465706172746d656e743115301306035504030c0c58406d79646f6d61696e2e636f6d302a300506032b65700321007e082c662a8d4d3271d797067f36caf25d6472b83901620a2eac193331a7f871a381ef3081ec308158409e0603551d11048196308193820c6d79646f6d61696e2e636f6d82107777772e6d79646f6d61696e2e636f6d820b6578616d706c652e636f6d820f7777772e65584078616d706c652e636f6d86537765622b63617264616e6f3a2f2f616464722f7374616b655f7465737431757165686b636b306c616a713867723238743975786e5840757667637172633630373078336b3972383034387a3879356773737274766e300b0603551d0f0404030205e0301d0603551d250416301406082b06010505070358400106082b06010505070302301d0603551d0e04160414251ddd56123655faa9348ff93c1e92ce3bc15a29300506032b6570034100b11c80d36fdcba650b950f06584087e448b3bcbeb2caa5249b24aff83d16ebbb71249e44bd0ecfab8b40fb772b6f977f98ac9122e13954439d0120980b347e3f9707181e81d9800558206e42f8e5582e89a76ebb13ef279df7841efce978f106bee196f0e3cfd347bb31a2e8186481a4000001820a0003010a6454657374";
+    const RAW: &str = "0a8c5840a30a815902ae308202aa3082025ca00302010202147735a70599e68b49554b1cb3a6cf5e34583b3c2f300506032b6570307c310b300906035504061302555331584013301106035504080c0a43616c69666f726e69613116301406035504070c0d53616e204672616e636973636f31123010060355040a0c094d79436f6d70616e79584031153013060355040b0c0c4d794465706172746d656e743115301306035504030c0c6d79646f6d61696e2e636f6d301e170d3234313132393034333134305a1758400d3235313132393034333134305a307c310b30090603550406130255533113301106035504080c0a43616c69666f726e69613116301406035504070c0d53616e5840204672616e636973636f31123010060355040a0c094d79436f6d70616e7931153013060355040b0c0c4d794465706172746d656e743115301306035504030c0c58406d79646f6d61696e2e636f6d302a300506032b65700321007e082c662a8d4d3271d797067f36caf25d6472b83901620a2eac193331a7f871a381ef3081ec308158409e0603551d11048196308193820c6d79646f6d61696e2e636f6d82107777772e6d79646f6d61696e2e636f6d820b6578616d706c652e636f6d820f7777772e65584078616d706c652e636f6d86537765622b63617264616e6f3a2f2f616464722f7374616b655f7465737431757165686b636b306c616a713867723238743975786e5840757667637172633630373078336b3972383034387a3879356773737274766e300b0603551d0f0404030205e0301d0603551d250416301406082b06010505070358400106082b06010505070302301d0603551d0e04160414251ddd56123655faa9348ff93c1e92ce3bc15a29300506032b6570034100b11c80d36fdcba650b950f06584087e448b3bcbeb2caa5249b24aff83d16ebbb71249e44bd0ecfab8b40fb772b6f977f98ac9122e13954439d0120980b347e3f9707181e81d9800558206e42f8e5582e89a76ebb13ef279df7841efce978f106bee196f0e3cfd347bb31a2e8186481a4000001820a0003010a6454657374";
     // Brotli data: 11
-    const BROTLI: &str =
-    "0b8958401bed02003c0e772c72637668c289a39b361dd1161a123da11e1118d08c7ab73ed1455e25aab3105e92334ba1fe128febedfb3e4912243755f42aca92094de82658404a4149a26917374c7cfd021376195439e4ea64844b46cfe1f87e9b6bf4d43c9dace1920ceeb2cc82bb60018b5b2de9571c5ea9c81dddd4077cc4571eb33181ce58409b38965811866581e4e903e6967333e85ab02e1b25665f272d24db06fb0183d3dd1cd937e2e260e3e0d045c976e057dde418766ea47dd551a68c20c015f508e25840118815ae0511d0e258b4440bd4b921222339016000ba853d2119394d8006a8a220d1c4755d3920f4403b302919d9c22f32106e1e10c3942a7d0f1c8ce42283205840528a20238dc8802d44cafe99612022d4abb8dc58894462642a21bb150449720b1f0e4e2a62bb9210b334d2f13ba4057d05f409d0fa3c666a3cb41cd012cc8e29584086ea45acd180f40932c052962cc156bad9f4a8a80d2f5d2e488c7ba8a496b1b1bf332482c7f8b9f981bfcb862878854a29842b460c8c782fb7905037399087685840693fc55005905188558891f50a0b0b0d8f0c04528e5d4a3c3c5c1cfc3360ef293f8938271225c0c6c727c4c59e3e4e09a2788847c7cfc79646ce62974cc11f1558405fbca2dc36eaf3594d18624bde0c7adac3324a828c2b833b3b3fbcd0c657c337f05bd53ece84f0adf329567b7234fe45897252656f11cf8ae6e56073452a93e85835133271a0fbc9f8d641adafb33a0267685f05fd95caf1ff3efa9d60febcfced727553ff21cd774cee682b161636860470b149c61f40";
+    const BROTLI: &str = "0b8958401bed02003c0e772c72637668c289a39b361dd1161a123da11e1118d08c7ab73ed1455e25aab3105e92334ba1fe128febedfb3e4912243755f42aca92094de82658404a4149a26917374c7cfd021376195439e4ea64844b46cfe1f87e9b6bf4d43c9dace1920ceeb2cc82bb60018b5b2de9571c5ea9c81dddd4077cc4571eb33181ce58409b38965811866581e4e903e6967333e85ab02e1b25665f272d24db06fb0183d3dd1cd937e2e260e3e0d045c976e057dde418766ea47dd551a68c20c015f508e25840118815ae0511d0e258b4440bd4b921222339016000ba853d2119394d8006a8a220d1c4755d3920f4403b302919d9c22f32106e1e10c3942a7d0f1c8ce42283205840528a20238dc8802d44cafe99612022d4abb8dc58894462642a21bb150449720b1f0e4e2a62bb9210b334d2f13ba4057d05f409d0fa3c666a3cb41cd012cc8e29584086ea45acd180f40932c052962cc156bad9f4a8a80d2f5d2e488c7ba8a496b1b1bf332482c7f8b9f981bfcb862878854a29842b460c8c782fb7905037399087685840693fc55005905188558891f50a0b0b0d8f0c04528e5d4a3c3c5c1cfc3360ef293f8938271225c0c6c727c4c59e3e4e09a2788847c7cfc79646ce62974cc11f1558405fbca2dc36eaf3594d18624bde0c7adac3324a828c2b833b3b3fbcd0c657c337f05bd53ece84f0adf329567b7234fe45897252656f11cf8ae6e56073452a93e85835133271a0fbc9f8d641adafb33a0267685f05fd95caf1ff3efa9d60febcfced727553ff21cd774cee682b161636860470b149c61f40";
     // Zstd data: 12
-    const ZSTD: &str=
-    "0c89584028b52ffd6000029d1100b41fa30a815902ae308202aa3082025ca00302010202147735a70599e68b49554b1cb3a6cf5e34583b3c2f300506032b6570307c310b5840300906035504061302555331133011080c0a43616c69666f726e696131163014070c0d53616e204672616e636973636f311230100a0c094d79436f6d70616e79584031153013060355040b0c0c4d794465706172746d656e74030c0c6d79646f6d61696e2e636f6d301e170d3234313132393034333134305a170d32352a0321007e5840082c662a8d4d3271d797067f36caf25d6472b83901620a2eac193331a7f871a381ef3081ec30819e0603551d110481963081938282107777772e820b6578616d5840706c65820f86537765622b63617264616e6f3a2f2f616464722f7374616b655f7465737431757165686b636b306c616a713867723238743975786e7576676371584072633630373078336b3972383034387a3879356773737274766e300b0f0404030205e0301d2504082b06010505070301020e04160414251ddd56123655faa93458408ff93c1e92ce3bc15a294100b11c80d36fdcba650b950f0687e448b3bcbeb2caa5249b24aff83d16ebbb71249e44bd0ecfab8b40fb772b6f977f98ac9122e139584054439d0120980b347e3f9707181e81d9800558206e42f8e589a76ebb13ef279df7841efce978f106bee196f0e3cfd347bb31a2e8186481a4000001820a000301583d0a64546573740013003d3e631feb0da1b068d5115f8161e2aed10b46d3acd0c00e1b9c80e50abeed00ca66cc432659ca8c6f3affd9b92ccedd01d66906";
+    const ZSTD: &str= "0c89584028b52ffd6000029d1100b41fa30a815902ae308202aa3082025ca00302010202147735a70599e68b49554b1cb3a6cf5e34583b3c2f300506032b6570307c310b5840300906035504061302555331133011080c0a43616c69666f726e696131163014070c0d53616e204672616e636973636f311230100a0c094d79436f6d70616e79584031153013060355040b0c0c4d794465706172746d656e74030c0c6d79646f6d61696e2e636f6d301e170d3234313132393034333134305a170d32352a0321007e5840082c662a8d4d3271d797067f36caf25d6472b83901620a2eac193331a7f871a381ef3081ec30819e0603551d110481963081938282107777772e820b6578616d5840706c65820f86537765622b63617264616e6f3a2f2f616464722f7374616b655f7465737431757165686b636b306c616a713867723238743975786e7576676371584072633630373078336b3972383034387a3879356773737274766e300b0f0404030205e0301d2504082b06010505070301020e04160414251ddd56123655faa93458408ff93c1e92ce3bc15a294100b11c80d36fdcba650b950f0687e448b3bcbeb2caa5249b24aff83d16ebbb71249e44bd0ecfab8b40fb772b6f977f98ac9122e139584054439d0120980b347e3f9707181e81d9800558206e42f8e589a76ebb13ef279df7841efce978f106bee196f0e3cfd347bb31a2e8186481a4000001820a000301583d0a64546573740013003d3e631feb0da1b068d5115f8161e2aed10b46d3acd0c00e1b9c80e50abeed00ca66cc432659ca8c6f3affd9b92ccedd01d66906";
 
     #[test]
     fn test_decode_x509_chunks_raw() {