remove unnecessary borsh derives (#555)

Author: zupzup

crates/bcr-ebill-core/src/bill/mod.rs

@@ -16,7 +16,6 @@ use super::{
     },
     notification::Notification,
 };
-use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
 pub mod validation;
@@ -200,7 +199,7 @@ pub struct BillValidateActionData {
     pub is_paid: bool,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct BitcreditBill {
     pub id: String,
     pub country_of_issuing: String,
@@ -222,7 +221,7 @@ pub struct BitcreditBill {
     pub files: Vec<File>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BillKeys {
     pub private_key: String,
     pub public_key: String,
@@ -536,7 +535,7 @@ pub enum BillsFilterRole {
     Contingent,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug)]
+#[derive(Debug)]
 pub struct PastEndorsee {
     pub pay_to_the_order_of: LightBillIdentParticipant,
     pub signed: LightSignedBy,
@@ -552,7 +551,7 @@ pub struct Endorsement {
     pub signing_address: Option<PostalAddress>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug)]
+#[derive(Debug)]
 pub struct LightSignedBy {
     pub data: LightBillParticipant,
     pub signatory: Option<LightBillIdentParticipant>,

crates/bcr-ebill-core/src/blockchain/bill/block.rs

@@ -27,7 +27,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::str::FromStr;
 
-#[derive(BorshDeserialize, BorshSerialize, Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 pub struct BillBlock {
     pub bill_id: String,
     pub id: u64,

crates/bcr-ebill-core/src/blockchain/bill/chain.rs

@@ -14,7 +14,6 @@ use crate::contact::{
     BillParticipant, ContactType, LightBillIdentParticipant, LightBillParticipant,
 };
 use crate::util::{self, BcrKeys};
-use borsh_derive::{BorshDeserialize, BorshSerialize};
 use log::error;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -27,7 +26,7 @@ pub struct BillParties {
     pub endorsee: Option<BillParticipantBlockData>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct BillBlockchain {
     blocks: Vec<BillBlock>,
 }

crates/bcr-ebill-core/src/company.rs

@@ -1,8 +1,7 @@
 use super::{File, PostalAddress};
-use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct Company {
     pub id: String,
     pub name: String,
@@ -17,7 +16,7 @@ pub struct Company {
     pub signatories: Vec<String>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct CompanyKeys {
     pub private_key: String,
     pub public_key: String,

crates/bcr-ebill-core/src/contact/mod.rs

@@ -57,7 +57,7 @@ pub struct Contact {
     pub nostr_relays: Vec<String>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 pub enum BillParticipant {
     Anon(BillAnonParticipant),
     Ident(BillIdentParticipant),
@@ -117,9 +117,7 @@ impl BillParticipant {
     }
 }
 
-#[derive(
-    BorshSerialize, BorshDeserialize, Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default,
-)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]
 pub struct BillAnonParticipant {
     /// The node id of the participant
     pub node_id: String,
@@ -148,9 +146,7 @@ impl From<BillParticipant> for BillAnonParticipant {
     }
 }
 
-#[derive(
-    BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default,
-)]
+#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Default)]
 pub struct BillIdentParticipant {
     /// The type of identity (0 = person, 1 = company)
     #[serde(rename = "type")]
@@ -168,18 +164,18 @@ pub struct BillIdentParticipant {
     pub nostr_relays: Vec<String>,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub enum LightBillParticipant {
     Anon(LightBillAnonParticipant),
     Ident(LightBillIdentParticipant),
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct LightBillAnonParticipant {
     pub node_id: String,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct LightBillIdentParticipant {
     #[serde(rename = "type")]
     pub t: ContactType,
@@ -214,7 +210,7 @@ impl From<BillAnonParticipant> for LightBillAnonParticipant {
     }
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone, Default)]
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct LightBillIdentParticipantWithAddress {
     #[serde(rename = "type")]
     pub t: ContactType,

crates/bcr-ebill-core/src/identity/mod.rs

@@ -1,39 +1,18 @@
 use super::{File, OptionalPostalAddress};
 use crate::{ValidationError, util::BcrKeys};
-use borsh_derive::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Serialize};
 
 pub mod validation;
 
 #[repr(u8)]
-#[derive(
-    Debug,
-    Clone,
-    serde_repr::Serialize_repr,
-    serde_repr::Deserialize_repr,
-    PartialEq,
-    Eq,
-    BorshSerialize,
-    BorshDeserialize,
-)]
-#[borsh(use_discriminant = true)]
+#[derive(Debug, Clone, serde_repr::Serialize_repr, serde_repr::Deserialize_repr, PartialEq, Eq)]
 pub enum SwitchIdentityType {
     Person = 0,
     Company = 1,
 }
 
 #[repr(u8)]
-#[derive(
-    Debug,
-    Clone,
-    serde_repr::Serialize_repr,
-    serde_repr::Deserialize_repr,
-    PartialEq,
-    Eq,
-    BorshSerialize,
-    BorshDeserialize,
-)]
-#[borsh(use_discriminant = true)]
+#[derive(Debug, Clone, serde_repr::Serialize_repr, serde_repr::Deserialize_repr, PartialEq, Eq)]
 pub enum IdentityType {
     Ident = 0,
     Anon = 1,
@@ -57,7 +36,7 @@ pub struct IdentityWithAll {
     pub key_pair: BcrKeys,
 }
 
-#[derive(BorshSerialize, BorshDeserialize, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct Identity {
     #[serde(rename = "type")]
     pub t: IdentityType,

crates/bcr-ebill-core/src/util/crypto.rs

@@ -331,12 +331,9 @@ fn keypair_from_mnemonic(mnemonic: &Mnemonic) -> Result<Keypair> {
 mod tests {
     use super::*;
     use crate::{
-        PostalAddress,
-        company::Company,
         tests::tests::{TEST_NODE_ID_SECP, TEST_NODE_ID_SECP_AS_NPUB_HEX},
         util,
     };
-    use borsh::to_vec;
 
     const PKEY: &str = "926a7ce0fdacad199307bcbbcda4869bca84d54b939011bafe6a83cb194130d3";
 
@@ -701,44 +698,6 @@ mod tests {
         assert_eq!(&msg, decrypted.as_ref().unwrap());
     }
 
-    #[test]
-    fn encrypt_decrypt_ecies_big_data() {
-        let company_data = Company {
-            id: "company_id".to_owned(),
-            name: "some_name".to_string(),
-            country_of_registration: Some("AT".to_string()),
-            city_of_registration: Some("Vienna".to_string()),
-            postal_address: PostalAddress {
-                country: "AT".to_string(),
-                city: "Vienna".to_string(),
-                zip: None,
-                address: "Smithstreet 1".to_string(),
-            },
-            email: "[email protected]".to_string(),
-            registration_number: Some("some_number".to_string()),
-            registration_date: Some("2012-01-01".to_string()),
-            proof_of_registration_file: None,
-            logo_file: None,
-            signatories: vec!["signatory".to_string()],
-        };
-        let mut companies = vec![];
-        for _ in 0..100 {
-            companies.push(company_data.clone());
-        }
-        let companies_bytes = to_vec(&companies).unwrap();
-        let keypair = BcrKeys::new();
-
-        let encrypted = encrypt_ecies(&companies_bytes, &keypair.get_public_key());
-        assert!(encrypted.is_ok());
-        let decrypted = decrypt_ecies(
-            encrypted.as_ref().unwrap(),
-            &keypair.get_private_key_string(),
-        );
-        assert!(decrypted.is_ok());
-
-        assert_eq!(&companies_bytes, decrypted.as_ref().unwrap());
-    }
-
     #[test]
     fn get_nostr_npub_as_hex_from_node_id_base() {
         let node_id = "0239a02d7aa976f4ef69173c271926d15fbff71e5b7d9e1adbb37fac2f3a370a70";

crates/bcr-ebill-persistence/src/bill.rs

@@ -8,8 +8,6 @@ use bcr_ebill_core::{
     blockchain::bill::{BillBlock, BillBlockchain, BillOpCode},
 };
 
-use borsh::{from_slice, to_vec};
-
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait BillStoreApi: ServiceTraitBounds {
@@ -73,23 +71,3 @@ pub trait BillChainStoreApi: ServiceTraitBounds {
     /// Get the whole blockchain
     async fn get_chain(&self, id: &str) -> Result<BillBlockchain>;
 }
-
-pub fn bill_chain_from_bytes(bytes: &[u8]) -> Result<BillBlockchain> {
-    let chain: BillBlockchain = from_slice(bytes)?;
-    Ok(chain)
-}
-
-pub fn bill_keys_from_bytes(bytes: &[u8]) -> Result<BillKeys> {
-    let keys: BillKeys = from_slice(bytes)?;
-    Ok(keys)
-}
-
-pub fn bill_keys_to_bytes(keys: &BillKeys) -> Result<Vec<u8>> {
-    let bytes = to_vec(&keys)?;
-    Ok(bytes)
-}
-
-pub fn bill_chain_to_bytes(chain: &BillBlockchain) -> Result<Vec<u8>> {
-    let bytes = to_vec(&chain)?;
-    Ok(bytes)
-}

crates/bcr-ebill-persistence/src/company.rs

@@ -6,8 +6,6 @@ use std::collections::HashMap;
 use super::Result;
 use async_trait::async_trait;
 
-use borsh::{from_slice, to_vec};
-
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait CompanyStoreApi: ServiceTraitBounds {
@@ -51,33 +49,3 @@ pub trait CompanyChainStoreApi: ServiceTraitBounds {
     /// Get the whole blockchain
     async fn get_chain(&self, id: &str) -> Result<CompanyBlockchain>;
 }
-
-pub fn company_from_bytes(bytes: &[u8]) -> Result<Company> {
-    let company: Company = from_slice(bytes)?;
-    Ok(company)
-}
-
-pub fn company_to_bytes(company: &Company) -> Result<Vec<u8>> {
-    let bytes = to_vec(&company)?;
-    Ok(bytes)
-}
-
-pub fn company_keys_from_bytes(bytes: &[u8]) -> Result<CompanyKeys> {
-    let company_keys: CompanyKeys = from_slice(bytes)?;
-    Ok(company_keys)
-}
-
-pub fn company_keys_to_bytes(company_keys: &CompanyKeys) -> Result<Vec<u8>> {
-    let bytes = to_vec(&company_keys)?;
-    Ok(bytes)
-}
-
-pub fn company_chain_from_bytes(bytes: &[u8]) -> Result<CompanyBlockchain> {
-    let company_chain: CompanyBlockchain = from_slice(bytes)?;
-    Ok(company_chain)
-}
-
-pub fn company_chain_to_bytes(company_chain: &CompanyBlockchain) -> Result<Vec<u8>> {
-    let bytes = to_vec(&company_chain)?;
-    Ok(bytes)
-}