Reverse dependencies between api and transport (#604)

Author: tompro

crates/bcr-ebill-api/Cargo.toml

@@ -27,7 +27,6 @@ futures.workspace = true
 infer = { version = "0.19.0", default-features = false }
 bcr-ebill-core.workspace = true
 bcr-ebill-persistence.workspace = true
-bcr-ebill-transport.workspace = true
 tokio.workspace = true
 tokio_with_wasm.workspace = true
 secp256k1.workspace = true

crates/bcr-ebill-api/src/lib.rs

@@ -7,7 +7,7 @@ mod blockchain;
 pub mod constants;
 pub mod data;
 pub mod external;
-mod persistence;
+pub mod persistence;
 pub mod service;
 #[cfg(test)]
 mod tests;

crates/bcr-ebill-api/src/service/bill_service/error.rs

@@ -1,4 +1,4 @@
-use crate::{blockchain, external, persistence, util};
+use crate::{blockchain, external, persistence, service::notification_service, util};
 use thiserror::Error;
 
 /// Generic error type
@@ -33,7 +33,7 @@ pub enum Error {
     Cryptography(#[from] util::crypto::Error),
 
     #[error("Notification error: {0}")]
-    Notification(#[from] bcr_ebill_transport::Error),
+    Notification(#[from] notification_service::Error),
 
     #[error("io error {0}")]
     Io(#[from] std::io::Error),

crates/bcr-ebill-api/src/service/bill_service/issue.rs

@@ -3,6 +3,7 @@ use crate::{
     constants::MAX_BILL_ATTACHMENTS,
     data::validate_node_id_network,
     get_config,
+    service::notification_service::event::BillChainEvent,
     util::{self, file::UploadFileType},
 };
 use bcr_ebill_core::{
@@ -17,7 +18,6 @@ use bcr_ebill_core::{
     contact::{BillAnonParticipant, BillIdentParticipant, BillParticipant},
     util::BcrKeys,
 };
-use bcr_ebill_transport::BillChainEvent;
 use log::{debug, error, info};
 
 impl BillService {

crates/bcr-ebill-api/src/service/bill_service/propagation.rs

@@ -1,5 +1,7 @@
 use std::collections::HashMap;
 
+use crate::service::notification_service::event::BillChainEvent;
+
 use super::{BillAction, Result, service::BillService};
 use bcr_ebill_core::{
     NodeId,
@@ -9,7 +11,6 @@ use bcr_ebill_core::{
     identity::Identity,
     notification::ActionType,
 };
-use bcr_ebill_transport::BillChainEvent;
 
 impl BillService {
     pub(super) async fn notify_for_block_action(

crates/bcr-ebill-api/src/service/bill_service/service.rs

@@ -25,6 +25,7 @@ use crate::persistence::company::{CompanyChainStoreApi, CompanyStoreApi};
 use crate::persistence::contact::ContactStoreApi;
 use crate::persistence::file_upload::FileUploadStoreApi;
 use crate::persistence::identity::{IdentityChainStoreApi, IdentityStoreApi};
+use crate::service::notification_service::NotificationServiceApi;
 use crate::util::BcrKeys;
 use crate::util::file::UploadFileType;
 use crate::{external, util};
@@ -47,7 +48,6 @@ use bcr_ebill_core::notification::ActionType;
 use bcr_ebill_core::util::currency;
 use bcr_ebill_core::{File, ServiceTraitBounds, Validate, ValidationError};
 use bcr_ebill_persistence::mint::MintStoreApi;
-use bcr_ebill_transport::NotificationServiceApi;
 use log::{debug, error, info, warn};
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;

crates/bcr-ebill-api/src/service/bill_service/test_utils.rs

@@ -5,15 +5,16 @@ use crate::{
     service::{
         company_service::tests::get_valid_company_block,
         contact_service::tests::get_baseline_contact,
+        notification_service::MockNotificationServiceApi,
     },
     tests::tests::{
         MockBillChainStoreApiMock, MockBillStoreApiMock, MockCompanyChainStoreApiMock,
         MockCompanyStoreApiMock, MockContactStoreApiMock, MockFileUploadStoreApiMock,
         MockIdentityChainStoreApiMock, MockIdentityStoreApiMock, MockMintStore,
-        MockNotificationService, VALID_PAYMENT_ADDRESS_TESTNET, bill_id_test,
-        bill_identified_participant_only_node_id, bill_participant_only_node_id, empty_address,
-        empty_bill_identified_participant, empty_bitcredit_bill, empty_identity, init_test_cfg,
-        node_id_test, node_id_test_other, node_id_test_other2, private_key_test,
+        VALID_PAYMENT_ADDRESS_TESTNET, bill_id_test, bill_identified_participant_only_node_id,
+        bill_participant_only_node_id, empty_address, empty_bill_identified_participant,
+        empty_bitcredit_bill, empty_identity, init_test_cfg, node_id_test, node_id_test_other,
+        node_id_test_other2, private_key_test,
     },
     util,
 };
@@ -52,7 +53,7 @@ pub struct MockBillContext {
     pub company_store: MockCompanyStoreApiMock,
     pub file_upload_store: MockFileUploadStoreApiMock,
     pub file_upload_client: MockFileStorageClientApi,
-    pub notification_service: MockNotificationService,
+    pub notification_service: MockNotificationServiceApi,
     pub mint_store: MockMintStore,
     pub mint_client: MockMintClientApi,
 }
@@ -283,7 +284,7 @@ pub fn get_ctx() -> MockBillContext {
         company_chain_store: MockCompanyChainStoreApiMock::new(),
         contact_store: MockContactStoreApiMock::new(),
         company_store: MockCompanyStoreApiMock::new(),
-        notification_service: MockNotificationService::new(),
+        notification_service: MockNotificationServiceApi::new(),
         mint_store: MockMintStore::new(),
         mint_client: MockMintClientApi::new(),
     }

crates/bcr-ebill-api/src/service/company_service.rs

@@ -1,4 +1,5 @@
 use super::Result;
+use super::notification_service::NotificationServiceApi;
 use crate::blockchain::Blockchain;
 use crate::blockchain::company::{
     CompanyAddSignatoryBlockData, CompanyBlock, CompanyBlockchain, CompanyCreateBlockData,
@@ -18,6 +19,7 @@ use crate::external::file_storage::FileStorageClientApi;
 use crate::get_config;
 use crate::persistence::company::{CompanyChainStoreApi, CompanyStoreApi};
 use crate::persistence::identity::IdentityChainStoreApi;
+use crate::service::notification_service::event::{CompanyChainEvent, IdentityChainEvent};
 use crate::util::BcrKeys;
 use crate::util::file::UploadFileType;
 use crate::{
@@ -29,9 +31,6 @@ use crate::{
 use async_trait::async_trait;
 use bcr_ebill_core::identity::IdentityType;
 use bcr_ebill_core::{NodeId, PublicKey, SecretKey, ServiceTraitBounds, ValidationError};
-use bcr_ebill_transport::NotificationServiceApi;
-use bcr_ebill_transport::event::company_events::CompanyChainEvent;
-use bcr_ebill_transport::event::identity_events::IdentityChainEvent;
 use log::{debug, error, info};
 use std::sync::Arc;
 
@@ -862,12 +861,15 @@ pub mod tests {
         blockchain::{Blockchain, identity::IdentityBlockchain},
         data::identity::IdentityWithAll,
         external::file_storage::MockFileStorageClientApi,
-        service::contact_service::tests::get_baseline_contact,
+        service::{
+            contact_service::tests::get_baseline_contact,
+            notification_service::MockNotificationServiceApi,
+        },
         tests::tests::{
             MockCompanyChainStoreApiMock, MockCompanyStoreApiMock, MockContactStoreApiMock,
             MockFileUploadStoreApiMock, MockIdentityChainStoreApiMock, MockIdentityStoreApiMock,
-            MockNotificationService, empty_address, empty_identity, empty_optional_address,
-            node_id_test, node_id_test_other, node_id_test_other2, private_key_test,
+            empty_address, empty_identity, empty_optional_address, node_id_test,
+            node_id_test_other, node_id_test_other2, private_key_test,
         },
     };
     use std::{collections::HashMap, str::FromStr};
@@ -881,7 +883,7 @@ pub mod tests {
         mock_contacts_storage: MockContactStoreApiMock,
         mock_identity_chain_storage: MockIdentityChainStoreApiMock,
         mock_company_chain_storage: MockCompanyChainStoreApiMock,
-        notification_service: MockNotificationService,
+        notification_service: MockNotificationServiceApi,
     ) -> CompanyService {
         CompanyService::new(
             Arc::new(mock_storage),
@@ -903,7 +905,7 @@ pub mod tests {
         MockContactStoreApiMock,
         MockIdentityChainStoreApiMock,
         MockCompanyChainStoreApiMock,
-        MockNotificationService,
+        MockNotificationServiceApi,
     ) {
         (
             MockCompanyStoreApiMock::new(),
@@ -913,7 +915,7 @@ pub mod tests {
             MockContactStoreApiMock::new(),
             MockIdentityChainStoreApiMock::new(),
             MockCompanyChainStoreApiMock::new(),
-            MockNotificationService::new(),
+            MockNotificationServiceApi::new(),
         )
     }
 

crates/bcr-ebill-api/src/service/identity_service.rs

@@ -1,4 +1,6 @@
 use super::Result;
+use super::notification_service::NotificationServiceApi;
+use super::notification_service::event::IdentityChainEvent;
 use crate::data::validate_node_id_network;
 use crate::external::file_storage::FileStorageClientApi;
 use crate::util::file::UploadFileType;
@@ -17,8 +19,6 @@ use async_trait::async_trait;
 use bcr_ebill_core::identity::validation::{validate_create_identity, validate_update_identity};
 use bcr_ebill_core::identity::{ActiveIdentityState, IdentityType};
 use bcr_ebill_core::{NodeId, ServiceTraitBounds, ValidationError};
-use bcr_ebill_transport::NotificationServiceApi;
-use bcr_ebill_transport::event::identity_events::IdentityChainEvent;
 use log::{debug, error, info};
 use std::sync::Arc;
 
@@ -678,9 +678,10 @@ mod tests {
     use super::*;
     use crate::{
         external::file_storage::MockFileStorageClientApi,
+        service::notification_service::MockNotificationServiceApi,
         tests::tests::{
             MockFileUploadStoreApiMock, MockIdentityChainStoreApiMock, MockIdentityStoreApiMock,
-            MockNotificationService, empty_identity, empty_optional_address, init_test_cfg,
+            empty_identity, empty_optional_address, init_test_cfg,
         },
     };
     use mockall::predicate::eq;
@@ -691,14 +692,14 @@ mod tests {
             Arc::new(MockFileUploadStoreApiMock::new()),
             Arc::new(MockFileStorageClientApi::new()),
             Arc::new(MockIdentityChainStoreApiMock::new()),
-            Arc::new(MockNotificationService::new()),
+            Arc::new(MockNotificationServiceApi::new()),
         )
     }
 
     fn get_service_with_chain_storage(
         mock_storage: MockIdentityStoreApiMock,
         mock_chain_storage: MockIdentityChainStoreApiMock,
-        notification: MockNotificationService,
+        notification: MockNotificationServiceApi,
     ) -> IdentityService {
         IdentityService::new(
             Arc::new(mock_storage),
@@ -722,7 +723,7 @@ mod tests {
             .returning(|| Ok(BcrKeys::new()));
         let mut chain_storage = MockIdentityChainStoreApiMock::new();
         chain_storage.expect_add_block().returning(|_| Ok(()));
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification
             .expect_send_identity_chain_events()
             .returning(|_| Ok(()))
@@ -762,7 +763,7 @@ mod tests {
             .returning(|| Ok(BcrKeys::new()));
         let mut chain_storage = MockIdentityChainStoreApiMock::new();
         chain_storage.expect_add_block().returning(|_| Ok(()));
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification
             .expect_send_identity_chain_events()
             .returning(|_| Ok(()))
@@ -816,7 +817,7 @@ mod tests {
                     .clone(),
             )
         });
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification
             .expect_send_identity_chain_events()
             .returning(|_| Ok(()))
@@ -861,7 +862,7 @@ mod tests {
         });
         let mut chain_storage = MockIdentityChainStoreApiMock::new();
         chain_storage.expect_add_block().returning(|_| Ok(()));
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification.expect_send_identity_chain_events().never();
 
         let service = get_service_with_chain_storage(storage, chain_storage, notification);
@@ -906,7 +907,7 @@ mod tests {
         });
         let mut chain_storage = MockIdentityChainStoreApiMock::new();
         chain_storage.expect_add_block().returning(|_| Ok(()));
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification.expect_send_identity_chain_events().never();
 
         let service = get_service_with_chain_storage(storage, chain_storage, notification);
@@ -956,7 +957,7 @@ mod tests {
             )
         });
         chain_storage.expect_add_block().returning(|_| Ok(()));
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification
             .expect_send_identity_chain_events()
             .returning(|_| Ok(()))
@@ -1046,7 +1047,7 @@ mod tests {
             .expect_add_block()
             .returning(|_| Ok(()))
             .once();
-        let mut notification = MockNotificationService::new();
+        let mut notification = MockNotificationServiceApi::new();
         notification.expect_send_identity_chain_events().never();
 
         let service = get_service_with_chain_storage(storage, chain_storage, notification);

crates/bcr-ebill-api/src/service/mod.rs

@@ -27,7 +27,7 @@ pub enum Error {
 
     /// errors stemming from sending or receiving notifications
     #[error("Notification service error: {0}")]
-    NotificationService(#[from] bcr_ebill_transport::Error),
+    NotificationService(#[from] notification_service::Error),
 
     /// errors stemming from handling bills
     #[error("Bill service error: {0}")]