remove unneeded NodeId trait (#552)

zupzup · web-flow · commit 6aede9db5142 · 2025-06-13T09:09:32.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.3.17
+
+* Use NodeId and BillId types internally instead of strings
+* Removed `NodeId` trait and replaced it with method
+
 # 0.3.16
 
 * Set the BTC network in the identity and check, if the persisted network is the same as the one configured in the application, failing if it doesn't.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.3.16"
+version = "0.3.17"
 edition = "2024"
 license = "MIT"
 
diff --git a/crates/bcr-ebill-api/src/service/bill_service/blocks.rs b/crates/bcr-ebill-api/src/service/bill_service/blocks.rs
@@ -9,7 +9,7 @@ use bcr_ebill_core::{
                 BillAcceptBlockData, BillEndorseBlockData, BillMintBlockData,
                 BillOfferToSellBlockData, BillRecourseBlockData, BillRecourseReasonBlockData,
                 BillRejectBlockData, BillRejectToBuyBlockData, BillRequestRecourseBlockData,
-                BillRequestToAcceptBlockData, BillRequestToPayBlockData, BillSellBlockData, NodeId,
+                BillRequestToAcceptBlockData, BillRequestToPayBlockData, BillSellBlockData,
             },
         },
         company::{CompanyBlock, CompanySignCompanyBillBlockData},
diff --git a/crates/bcr-ebill-api/src/service/bill_service/data_fetching.rs b/crates/bcr-ebill-api/src/service/bill_service/data_fetching.rs
@@ -5,7 +5,6 @@ use super::{Error, Result};
 use bcr_ebill_core::ValidationError;
 use bcr_ebill_core::bill::BillMintStatus;
 use bcr_ebill_core::bill::validation::get_expiration_deadline_base_for_req_to_pay;
-use bcr_ebill_core::blockchain::bill::block::NodeId;
 use bcr_ebill_core::constants::RECOURSE_DEADLINE_SECONDS;
 use bcr_ebill_core::contact::{BillParticipant, Contact};
 use bcr_ebill_core::identity::IdentityType;
diff --git a/crates/bcr-ebill-api/src/service/bill_service/issue.rs b/crates/bcr-ebill-api/src/service/bill_service/issue.rs
@@ -5,10 +5,7 @@ use bcr_ebill_core::{
     bill::{BillIssueData, BillKeys, BillType, BitcreditBill, validation::validate_bill_issue},
     blockchain::{
         Blockchain,
-        bill::{
-            BillBlockchain,
-            block::{BillIssueBlockData, NodeId},
-        },
+        bill::{BillBlockchain, block::BillIssueBlockData},
     },
     contact::{BillAnonParticipant, BillIdentParticipant, BillParticipant},
     util::BcrKeys,
diff --git a/crates/bcr-ebill-api/src/service/bill_service/mod.rs b/crates/bcr-ebill-api/src/service/bill_service/mod.rs
@@ -237,7 +237,7 @@ pub mod tests {
                     BillEndorseBlockData, BillMintBlockData, BillOfferToSellBlockData,
                     BillParticipantBlockData, BillRecourseReasonBlockData, BillRejectBlockData,
                     BillRequestRecourseBlockData, BillRequestToAcceptBlockData,
-                    BillRequestToPayBlockData, BillSellBlockData, BillSignatoryBlockData, NodeId,
+                    BillRequestToPayBlockData, BillSellBlockData, BillSignatoryBlockData,
                 },
             },
         },
diff --git a/crates/bcr-ebill-api/src/service/bill_service/payment.rs b/crates/bcr-ebill-api/src/service/bill_service/payment.rs
@@ -7,7 +7,7 @@ use bcr_ebill_core::{
         Blockchain,
         bill::{
             BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
-            block::{BillRecourseReasonBlockData, NodeId},
+            block::BillRecourseReasonBlockData,
         },
     },
     company::{Company, CompanyKeys},
diff --git a/crates/bcr-ebill-api/src/service/bill_service/service.rs b/crates/bcr-ebill-api/src/service/bill_service/service.rs
@@ -31,7 +31,7 @@ use bcr_ebill_core::bill::{
     BillIssueData, BillValidateActionData, PastPaymentDataPayment, PastPaymentDataRecourse,
     PastPaymentDataSell, PastPaymentResult, PastPaymentStatus,
 };
-use bcr_ebill_core::blockchain::bill::block::{BillParticipantBlockData, NodeId};
+use bcr_ebill_core::blockchain::bill::block::BillParticipantBlockData;
 use bcr_ebill_core::company::{Company, CompanyKeys};
 use bcr_ebill_core::constants::{
     ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS,
diff --git a/crates/bcr-ebill-api/src/service/notification_service/default_service.rs b/crates/bcr-ebill-api/src/service/notification_service/default_service.rs
@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use bcr_ebill_core::blockchain::BlockchainType;
-use bcr_ebill_core::blockchain::bill::block::NodeId;
 use bcr_ebill_core::contact::{BillAnonParticipant, BillParticipant, ContactType};
 use bcr_ebill_persistence::nostr::{
     NostrChainEvent, NostrChainEventStoreApi, NostrQueuedMessage, NostrQueuedMessageStoreApi,
diff --git a/crates/bcr-ebill-api/src/service/notification_service/nostr.rs b/crates/bcr-ebill-api/src/service/notification_service/nostr.rs
@@ -1,9 +1,5 @@
 use async_trait::async_trait;
-use bcr_ebill_core::{
-    blockchain::{BlockchainType, bill::block::NodeId},
-    contact::BillParticipant,
-    util::crypto,
-};
+use bcr_ebill_core::{blockchain::BlockchainType, contact::BillParticipant, util::crypto};
 use bcr_ebill_transport::{
     chain_keys::ChainKeyServiceApi,
     event::EventEnvelope,
diff --git a/crates/bcr-ebill-core/src/bill/mod.rs b/crates/bcr-ebill-core/src/bill/mod.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use crate::{
     ID_PREFIX, NETWORK_MAINNET, NETWORK_REGTEST, NETWORK_TESTNET, NETWORK_TESTNET4,
     ValidationError,
-    blockchain::bill::{BillBlockchain, block::NodeId},
+    blockchain::bill::BillBlockchain,
     contact::{BillParticipant, LightBillParticipant},
     network_char,
     util::{self, BcrKeys},
diff --git a/crates/bcr-ebill-core/src/bill/validation.rs b/crates/bcr-ebill-core/src/bill/validation.rs
@@ -4,7 +4,7 @@ use crate::{
         Block, Blockchain,
         bill::{
             BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
-            block::{BillRecourseReasonBlockData, NodeId},
+            block::BillRecourseReasonBlockData,
         },
     },
     constants::{ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS},
diff --git a/crates/bcr-ebill-core/src/blockchain/bill/block.rs b/crates/bcr-ebill-core/src/blockchain/bill/block.rs
@@ -27,10 +27,6 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::str::FromStr;
 
-pub trait NodeId {
-    fn node_id(&self) -> String;
-}
-
 #[derive(BorshDeserialize, BorshSerialize, Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct BillBlock {
     pub bill_id: String,
@@ -488,8 +484,8 @@ pub enum BillParticipantBlockData {
     Ident(BillIdentParticipantBlockData),
 }
 
-impl NodeId for BillParticipantBlockData {
-    fn node_id(&self) -> String {
+impl BillParticipantBlockData {
+    pub fn node_id(&self) -> String {
         match self {
             BillParticipantBlockData::Anon(data) => data.node_id.clone(),
             BillParticipantBlockData::Ident(data) => data.node_id.clone(),
@@ -571,8 +567,8 @@ pub struct BillIdentParticipantBlockData {
     pub postal_address: PostalAddress,
 }
 
-impl NodeId for BillIdentParticipantBlockData {
-    fn node_id(&self) -> String {
+impl BillIdentParticipantBlockData {
+    pub fn node_id(&self) -> String {
         self.node_id.clone()
     }
 }
diff --git a/crates/bcr-ebill-core/src/blockchain/bill/chain.rs b/crates/bcr-ebill-core/src/blockchain/bill/chain.rs
@@ -3,7 +3,7 @@ use super::PaymentInfo;
 use super::block::{
     BillBlock, BillEndorseBlockData, BillIdentParticipantBlockData, BillIssueBlockData,
     BillMintBlockData, BillOfferToSellBlockData, BillParticipantBlockData, BillRecourseBlockData,
-    BillRequestRecourseBlockData, BillSellBlockData, NodeId,
+    BillRequestRecourseBlockData, BillSellBlockData,
 };
 use super::{BillOpCode, RecourseWaitingForPayment};
 use super::{OfferToSellWaitingForPayment, RecoursePaymentInfo};
diff --git a/crates/bcr-ebill-core/src/contact/mod.rs b/crates/bcr-ebill-core/src/contact/mod.rs
@@ -1,4 +1,4 @@
-use crate::{ValidationError, blockchain::bill::block::NodeId, identity::IdentityType};
+use crate::{ValidationError, identity::IdentityType};
 
 use super::{File, PostalAddress, company::Company, identity::Identity};
 use borsh_derive::{BorshDeserialize, BorshSerialize};
@@ -70,6 +70,13 @@ impl Default for BillParticipant {
 }
 
 impl BillParticipant {
+    pub fn node_id(&self) -> String {
+        match self {
+            BillParticipant::Ident(data) => data.node_id.clone(),
+            BillParticipant::Anon(data) => data.node_id.clone(),
+        }
+    }
+
     pub fn postal_address(&self) -> Option<PostalAddress> {
         match self {
             BillParticipant::Ident(data) => Some(data.postal_address.clone()),
@@ -110,15 +117,6 @@ impl BillParticipant {
     }
 }
 
-impl NodeId for BillParticipant {
-    fn node_id(&self) -> String {
-        match self {
-            BillParticipant::Ident(data) => data.node_id.clone(),
-            BillParticipant::Anon(data) => data.node_id.clone(),
-        }
-    }
-}
-
 #[derive(
     BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default,
 )]
diff --git a/crates/bcr-ebill-transport/src/handler/bill_chain_event_processor.rs b/crates/bcr-ebill-transport/src/handler/bill_chain_event_processor.rs
@@ -8,7 +8,6 @@ use bcr_ebill_core::bill::BillValidateActionData;
 use bcr_ebill_core::blockchain::Blockchain;
 use bcr_ebill_core::blockchain::bill::BillOpCode;
 use bcr_ebill_core::blockchain::bill::block::BillIssueBlockData;
-use bcr_ebill_core::blockchain::bill::block::NodeId;
 use bcr_ebill_core::blockchain::bill::{BillBlock, BillBlockchain};
 use bcr_ebill_core::nostr_contact::HandshakeStatus;
 use bcr_ebill_core::nostr_contact::NostrContact;
