split up data between web and the rest (#404)

Author: zupzup

src/blockchain/bill/block.rs

@@ -7,7 +7,7 @@ use super::{BillOpCode, RecourseWaitingForPayment};
 use super::{OfferToSellWaitingForPayment, RecoursePaymentInfo};
 use crate::blockchain::{Block, Blockchain, Error};
 use crate::constants::{PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS};
-use crate::service::bill_service::BillKeys;
+use crate::data::bill::BillKeys;
 use crate::util::{self, BcrKeys};
 use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
@@ -251,7 +251,7 @@ mod tests {
     use super::*;
     use crate::{
         blockchain::bill::{block::BillOfferToSellBlockData, tests::get_baseline_identity},
-        service::{bill_service::BitcreditBill, contact_service::IdentityPublicData},
+        data::{bill::BitcreditBill, contact::IdentityPublicData},
         tests::tests::{get_bill_keys, TEST_PRIVATE_KEY_SECP},
     };
 

src/blockchain/bill/chain.rs

@@ -1,9 +1,5 @@
 use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-use super::{Blockchain, Result};
-use crate::service::bill_service::BillKeys;
 
 pub mod block;
 pub mod chain;
@@ -13,16 +9,7 @@ use block::BillIdentityBlockData;
 pub use chain::BillBlockchain;
 
 #[derive(
-    BorshSerialize,
-    BorshDeserialize,
-    Serialize,
-    Deserialize,
-    Debug,
-    Clone,
-    PartialEq,
-    Eq,
-    ToSchema,
-    Hash,
+    BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Hash,
 )]
 pub enum BillOpCode {
     Issue,
@@ -70,69 +57,14 @@ pub struct RecoursePaymentInfo {
     pub currency: String,
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, ToSchema)]
-pub struct BillBlockchainToReturn {
-    pub blocks: Vec<BillBlockToReturn>,
-}
-
-impl BillBlockchainToReturn {
-    /// Creates a new blockchain to return by transforming a given blockchain into its corresponding representation.
-    ///
-    /// # Parameters
-    /// * `chain` - The blockchain to be transformed. It contains the list of blocks and the initial bill version
-    ///   necessary for processing.
-    /// * `bill_keys` - The keys for the bill
-    ///
-    /// # Returns
-    /// A new instance containing the transformed `BillBlockToReturn` objects.
-    ///
-    pub fn new(chain: BillBlockchain, bill_keys: &BillKeys) -> Result<Self> {
-        let mut blocks: Vec<BillBlockToReturn> = Vec::new();
-        for block in chain.blocks() {
-            blocks.push(BillBlockToReturn::new(block.clone(), bill_keys)?);
-        }
-        Ok(Self { blocks })
-    }
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, ToSchema)]
-pub struct BillBlockToReturn {
-    pub id: u64,
-    pub hash: String,
-    pub timestamp: u64,
-    pub data: String,
-    pub previous_hash: String,
-    pub signature: String,
-    pub op_code: BillOpCode,
-    pub label: String,
-}
-
-impl BillBlockToReturn {
-    /// Creates a new block to return for the given bill, with an attached history label,
-    /// describing what happened in this block
-    pub fn new(block: BillBlock, bill_keys: &BillKeys) -> Result<Self> {
-        let label = block.get_history_label(bill_keys)?;
-
-        Ok(Self {
-            id: block.id,
-            hash: block.hash,
-            timestamp: block.timestamp,
-            data: block.data,
-            previous_hash: block.previous_hash,
-            signature: block.signature,
-            op_code: block.op_code,
-            label,
-        })
-    }
-}
-
 #[cfg(test)]
 pub mod tests {
     use super::*;
     use crate::{
-        service::{
-            bill_service::BitcreditBill,
-            identity_service::{Identity, IdentityWithAll},
+        blockchain::Blockchain,
+        data::{
+            bill::BitcreditBill,
+            identity::{Identity, IdentityWithAll},
         },
         tests::tests::TEST_PRIVATE_KEY_SECP,
         util::BcrKeys,

src/blockchain/bill/mod.rs

@@ -1,9 +1,11 @@
 use super::bill::BillOpCode;
 use super::Result;
 use super::{Block, Blockchain, FIRST_BLOCK_ID};
-use crate::service::company_service::{CompanyKeys, CompanyToReturn};
+use crate::data::{
+    company::{Company, CompanyKeys},
+    File, OptionalPostalAddress, PostalAddress,
+};
 use crate::util::{self, crypto, BcrKeys};
-use crate::web::data::{File, OptionalPostalAddress, PostalAddress};
 use borsh::to_vec;
 use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
@@ -74,8 +76,8 @@ pub struct CompanyCreateBlockData {
     pub signatories: Vec<String>,
 }
 
-impl From<CompanyToReturn> for CompanyCreateBlockData {
-    fn from(value: CompanyToReturn) -> Self {
+impl From<Company> for CompanyCreateBlockData {
+    fn from(value: Company) -> Self {
         Self {
             id: value.id,
             name: value.name,
@@ -469,17 +471,15 @@ impl CompanyBlockchain {
 mod tests {
     use super::*;
     use crate::{
-        service::company_service::{tests::get_baseline_company_data, CompanyToReturn},
-        tests::tests::TEST_PUB_KEY_SECP,
+        service::company_service::tests::get_baseline_company_data, tests::tests::TEST_PUB_KEY_SECP,
     };
 
     #[test]
     fn create_and_check_validity() {
-        let (id, (company, company_keys)) = get_baseline_company_data();
-        let to_return = CompanyToReturn::from(id, company);
+        let (_id, (company, company_keys)) = get_baseline_company_data();
 
         let chain = CompanyBlockchain::new(
-            &CompanyCreateBlockData::from(to_return),
+            &CompanyCreateBlockData::from(company),
             &BcrKeys::new(),
             &company_keys,
             1731593928,
@@ -491,11 +491,10 @@ mod tests {
     #[test]
     fn multi_block() {
         let (id, (company, company_keys)) = get_baseline_company_data();
-        let to_return = CompanyToReturn::from(id.clone(), company);
         let identity_keys = BcrKeys::new();
 
         let chain = CompanyBlockchain::new(
-            &CompanyCreateBlockData::from(to_return),
+            &CompanyCreateBlockData::from(company),
             &identity_keys,
             &company_keys,
             1731593928,

src/blockchain/company/mod.rs

@@ -1,9 +1,8 @@
 use super::bill::BillOpCode;
 use super::Result;
 use super::{Block, Blockchain, FIRST_BLOCK_ID};
-use crate::service::identity_service::Identity;
+use crate::data::{identity::Identity, File, OptionalPostalAddress};
 use crate::util::{self, crypto, BcrKeys};
-use crate::web::data::{File, OptionalPostalAddress};
 use borsh::to_vec;
 use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};