Protocol Separation (#723)

Author: zupzup

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Remove `BackupService` and `BackupStore` since it's unused
 * Remove file-based `FileUpload` - we use surreal/nostr-based everywhere
 * Refactoring & Restructuring, removing cross-crate exports (breaking for Library dependents)
+* Properly separate `protocol` parts from `application` in `bcr-ebill-core` (breaking for Library dependents, breaking DB change)
 
 # 0.4.12
 

crates/bcr-ebill-api/src/external/bitcoin.rs

@@ -1,10 +1,12 @@
 use crate::get_config;
 use async_trait::async_trait;
 use bcr_ebill_core::{
-    BitcoinAddress, PublicKey, ServiceTraitBounds,
-    bill::{InMempoolData, PaidData, PaymentState},
-    sum::Sum,
-    timestamp::Timestamp,
+    application::ServiceTraitBounds,
+    application::bill::{InMempoolData, PaidData, PaymentState},
+    protocol::BitcoinAddress,
+    protocol::PublicKey,
+    protocol::Sum,
+    protocol::Timestamp,
 };
 use bitcoin::{Network, secp256k1::Scalar};
 use log::debug;

crates/bcr-ebill-api/src/external/court.rs

@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 use bcr_ebill_core::{
-    ServiceTraitBounds, blockchain::bill::BillToShareWithExternalParty, util::BcrKeys,
+    application::ServiceTraitBounds, protocol::blockchain::bill::BillToShareWithExternalParty,
+    protocol::crypto::BcrKeys,
 };
 use bitcoin::hashes::{Hash, sha256::Hash as Sha256};
 use borsh::to_vec;
@@ -33,8 +34,8 @@ use mockall::automock;
 pub struct ReceiveBillRequest {
     pub content: BillToShareWithExternalParty,
     #[borsh(
-        serialize_with = "bcr_ebill_core::util::borsh::serialize_pubkey",
-        deserialize_with = "bcr_ebill_core::util::borsh::deserialize_pubkey"
+        serialize_with = "bcr_ebill_core::protocol::serialization::serialize_pubkey",
+        deserialize_with = "bcr_ebill_core::protocol::serialization::deserialize_pubkey"
     )]
     pub public_key: PublicKey,
 }

crates/bcr-ebill-api/src/external/email.rs

@@ -1,7 +1,7 @@
 use async_trait::async_trait;
 use bcr_common::core::{BillId, NodeId};
-use bcr_ebill_core::email::Email;
-use bcr_ebill_core::{ServiceTraitBounds, notification::BillEventType};
+use bcr_ebill_core::application::ServiceTraitBounds;
+use bcr_ebill_core::protocol::{Email, event::bill_events::BillEventType};
 use borsh_derive::BorshSerialize;
 use nostr::hashes::Hash;
 use nostr::util::SECP256K1;

crates/bcr-ebill-api/src/external/file_storage.rs

@@ -1,7 +1,7 @@
 use std::io::Write;
 
 use async_trait::async_trait;
-use bcr_ebill_core::ServiceTraitBounds;
+use bcr_ebill_core::application::ServiceTraitBounds;
 use nostr::hashes::{
     Hash,
     sha256::{self, Hash as Sha256HexHash},

crates/bcr-ebill-api/src/external/identity_proof.rs

@@ -1,8 +1,8 @@
 use async_trait::async_trait;
 use bcr_ebill_core::{
-    ServiceTraitBounds, ValidationError,
-    identity_proof::{IdentityProofStamp, IdentityProofStatus},
-    util::crypto,
+    application::ServiceTraitBounds, application::ValidationError,
+    application::identity_proof::IdentityProofStatus, protocol::IdentityProofStamp,
+    protocol::crypto,
 };
 use borsh_derive::BorshSerialize;
 use log::error;
@@ -176,7 +176,7 @@ fn create_proxy_req(
 pub mod tests {
     use std::str::FromStr;
 
-    use bcr_ebill_core::util::BcrKeys;
+    use bcr_ebill_core::protocol::crypto::BcrKeys;
     use bitcoin::XOnlyPublicKey;
     use nostr::key::SecretKey;
     use secp256k1::schnorr::Signature;
@@ -226,7 +226,6 @@ pub mod tests {
         let node_id = node_id_test();
         let relay_url = url::Url::parse("wss://bcr-relay-dev.minibill.tech").unwrap();
         let private_key = BcrKeys::from_private_key(&private_key_test())
-            .unwrap()
             .get_nostr_keys()
             .secret_key()
             .to_owned();

crates/bcr-ebill-api/src/external/mint.rs

@@ -5,10 +5,10 @@ use bcr_common::client::keys::Client as KeysClient;
 use bcr_common::client::quote::Client as QuoteClient;
 use bcr_common::client::swap::Client as SwapClient;
 use bcr_common::wire::quotes::{ResolveOffer, StatusReply};
-use bcr_ebill_core::sum::Sum;
+use bcr_ebill_core::protocol::Sum;
 use bcr_ebill_core::{
-    DateTimeUtc, SecretKey, ServiceTraitBounds, blockchain::bill::BillToShareWithExternalParty,
-    util::BcrKeys,
+    application::ServiceTraitBounds, protocol::DateTimeUtc, protocol::SecretKey,
+    protocol::blockchain::bill::BillToShareWithExternalParty, protocol::crypto::BcrKeys,
 };
 use cashu::{ProofsMethods, State, nut01 as cdk01, nut02 as cdk02};
 use thiserror::Error;

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

@@ -4,7 +4,6 @@ pub mod email;
 pub mod file_storage;
 pub mod identity_proof;
 pub mod mint;
-pub mod time;
 
 use thiserror::Error;