Fix after merge

Author: stanislav-tkach

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

@@ -5,11 +5,11 @@
 use std::{borrow::Cow, collections::HashMap};
 
 use anyhow::anyhow;
-use cardano_blockchain_types::{
+use cardano_blockchain_types::{MultiEraBlock, TxnIndex};
+use catalyst_types::{
     hashes::{Blake2b256Hash, BLAKE_2B256_SIZE},
-    MultiEraBlock, TxnIndex,
+    problem_report::ProblemReport,
 };
-use catalyst_types::problem_report::ProblemReport;
 use cbork_utils::decode_helper::{decode_bytes, decode_helper, decode_map_len};
 use minicbor::{
     decode::{self},

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

@@ -1,7 +1,7 @@
 //! Transaction input hash type
 
 use anyhow::Context;
-use cardano_blockchain_types::hashes::Blake2b128Hash;
+use catalyst_types::hashes::Blake2b128Hash;
 
 /// A 16-byte hash of the transaction inputs field.
 ///

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

@@ -23,11 +23,11 @@
 
 use std::borrow::Cow;
 
-use cardano_blockchain_types::{
+use cardano_blockchain_types::{TxnWitness, VKeyHash};
+use catalyst_types::{
     hashes::{Blake2b128Hash, Blake2b256Hash},
-    TxnWitness, VKeyHash,
+    problem_report::ProblemReport,
 };
-use catalyst_types::problem_report::ProblemReport;
 use pallas::{
     codec::{
         minicbor::{Encode, Encoder},
@@ -193,7 +193,6 @@ pub fn validate_role_signing_key(role_data: &RoleData, report: &ProblemReport) {
 mod tests {
     use std::str::FromStr;
 
-    use cardano_blockchain_types::hashes::Blake2b256Hash;
     use uuid::Uuid;
 
     use super::*;

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

@@ -4,7 +4,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use anyhow::bail;
 use c509_certificate::c509::C509;
-use cardano_blockchain_types::hashes::Blake2b256Hash;
+use catalyst_types::hashes::Blake2b256Hash;
 use ed25519_dalek::VerifyingKey;
 use tracing::{error, warn};
 use uuid::Uuid;