Refactor AccountIdentifier conversion to use serde_bytes::ByteBuf

B3Pay · Sep 25, 2024 · a3e8655 · a3e8655
1 parent cf1cb7c
commit a3e8655
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/ledger/identifier.rs b/src/ledger/identifier.rs
@@ -166,6 +166,12 @@ impl From<Principal> for AccountIdentifier {
     }
 }
 
+impl From<AccountIdentifier> for serde_bytes::ByteBuf {
+    fn from(account: AccountIdentifier) -> Self {
+        serde_bytes::ByteBuf::from(account.to_vec())
+    }
+}
+
 impl CandidType for AccountIdentifier {
     // The type expected for account identifier is
     fn _ty() -> candid::types::Type {

diff --git a/src/ledger/types/icp/transfer.rs b/src/ledger/types/icp/transfer.rs
@@ -3,7 +3,6 @@ pub use error::*;
 
 use crate::ledger::currency::ICPToken;
 use crate::ledger::types::{TransferBlockIndex, TransferMemo};
-use crate::ledger::AccountIdentifier;
 use crate::Subaccount;
 use candid::CandidType;
 use serde::{Deserialize, Serialize};
@@ -19,7 +18,7 @@ pub struct ICPTransferArgs {
     pub memo: TransferMemo,
     pub fee: ICPToken,
     pub amount: ICPToken,
-    pub to: Vec<u8>,
+    pub to: serde_bytes::ByteBuf,
     pub from_subaccount: Option<Subaccount>,
     pub created_at_time: Option<ICPTransferTimestamp>,
 }
@@ -28,5 +27,5 @@ pub type ICPTransferResult = Result<TransferBlockIndex, ICPTransferError>;
 
 #[derive(CandidType, Deserialize, Serialize, Clone)]
 pub struct ICPAccountBalanceArgs {
-    pub account: AccountIdentifier,
+    pub account: serde_bytes::ByteBuf,
 }