fix: follow the js api

Signed-off-by: Ivaylo Nikolov <[email protected]>

Author: ivaylonikolov7

examples/transfer_with_hooks.rs

@@ -206,7 +206,7 @@ async fn main() -> anyhow::Result<()> {
     // Transaction 1: HBAR transfers with hook
     println!("\n1. Executing HBAR TransferTransaction with hook...");
     TransferTransaction::new()
-        .hbar_transfer_with_hook(sender_account_id, Hbar::from_tinybars(-1), hbar_hook)
+        .add_hbar_transfer_with_hook(sender_account_id, Hbar::from_tinybars(-1), hbar_hook)
         .hbar_transfer(receiver_account_id, Hbar::from_tinybars(1))
         .freeze_with(&client)?
         .sign(sender_key.clone())
@@ -219,7 +219,7 @@ async fn main() -> anyhow::Result<()> {
     // Transaction 2: NFT transfer with sender and receiver hooks
     println!("\n2. Executing NFT TransferTransaction with hooks...");
     TransferTransaction::new()
-        .nft_transfer_with_both_hooks(
+        .add_nft_transfer_with_hook(
             nft_id,
             sender_account_id,
             receiver_account_id,
@@ -237,7 +237,7 @@ async fn main() -> anyhow::Result<()> {
     // Transaction 3: Fungible token transfers with hook
     println!("\n3. Executing Fungible Token TransferTransaction with hook...");
     TransferTransaction::new()
-        .token_transfer_with_hook(
+        .add_token_transfer_with_hook(
             fungible_token_id,
             sender_account_id,
             -1_000,

src/hooks/fungible_hook_call.rs

@@ -1,7 +1,6 @@
 use hedera_proto::services;
 
 use crate::hooks::{
-    EvmHookCall,
     FungibleHookType,
     HookCall,
 };
@@ -45,6 +44,7 @@ impl ToProtobuf for FungibleHookCall {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::hooks::EvmHookCall;
 
     #[test]
     fn test_fungible_hook_call_creation() {

src/hooks/nft_hook_call.rs

@@ -1,7 +1,6 @@
 use hedera_proto::services;
 
 use crate::hooks::{
-    EvmHookCall,
     HookCall,
     NftHookType,
 };
@@ -45,6 +44,7 @@ impl ToProtobuf for NftHookCall {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::hooks::EvmHookCall;
 
     #[test]
     fn test_nft_hook_call_creation() {

src/transfer_transaction.rs

@@ -305,28 +305,6 @@ impl TransferTransaction {
         self._hbar_transfer(account_id, amount, false, Some(hook_call))
     }
 
-    /// Add an NFT transfer with a sender hook call.
-    pub fn nft_transfer_with_sender_hook(
-        &mut self,
-        nft_id: impl Into<NftId>,
-        sender: AccountId,
-        receiver: AccountId,
-        sender_hook_call: NftHookCall,
-    ) -> &mut Self {
-        self._nft_transfer(nft_id.into(), sender, receiver, false, Some(sender_hook_call), None)
-    }
-
-    /// Add an NFT transfer with a receiver hook call.
-    pub fn nft_transfer_with_receiver_hook(
-        &mut self,
-        nft_id: impl Into<NftId>,
-        sender: AccountId,
-        receiver: AccountId,
-        receiver_hook_call: NftHookCall,
-    ) -> &mut Self {
-        self._nft_transfer(nft_id.into(), sender, receiver, false, None, Some(receiver_hook_call))
-    }
-
     /// Add a token transfer with a fungible hook call.
     pub fn add_token_transfer_with_hook(
         &mut self,
@@ -338,29 +316,8 @@ impl TransferTransaction {
         self._token_transfer(token_id, account_id, amount, false, None, Some(hook_call))
     }
 
-    /// Add a hbar transfer with a fungible hook call.
-    pub fn hbar_transfer_with_hook(
-        &mut self,
-        account_id: AccountId,
-        amount: Hbar,
-        hook_call: FungibleHookCall,
-    ) -> &mut Self {
-        self._hbar_transfer(account_id, amount, false, Some(hook_call))
-    }
-
-    /// Add a token transfer with a fungible hook call.
-    pub fn token_transfer_with_hook(
-        &mut self,
-        token_id: TokenId,
-        account_id: AccountId,
-        amount: i64,
-        hook_call: FungibleHookCall,
-    ) -> &mut Self {
-        self._token_transfer(token_id, account_id, amount, false, None, Some(hook_call))
-    }
-
     /// Add an NFT transfer with both sender and receiver hook calls.
-    pub fn nft_transfer_with_both_hooks(
+    pub fn add_nft_transfer_with_hook(
         &mut self,
         nft_id: impl Into<NftId>,
         sender: AccountId,

tests/e2e/token/transfer_with_hooks.rs

@@ -95,7 +95,7 @@ async fn can_transfer_hbar_with_pre_tx_allowance_hook() -> anyhow::Result<()> {
 
     // Perform transfer with hook
     let transfer_receipt = TransferTransaction::new()
-        .hbar_transfer_with_hook(sender_id, Hbar::from_tinybars(-100), fungible_hook_call)
+        .add_hbar_transfer_with_hook(sender_id, Hbar::from_tinybars(-100), fungible_hook_call)
         .hbar_transfer(receiver_id, Hbar::from_tinybars(100))
         .freeze_with(&client)?
         .sign(sender_key)
@@ -160,7 +160,7 @@ async fn can_transfer_hbar_with_pre_post_tx_allowance_hook() -> anyhow::Result<(
 
     // Perform transfer with hook
     let transfer_receipt = TransferTransaction::new()
-        .hbar_transfer_with_hook(sender_id, Hbar::from_tinybars(-100), fungible_hook_call)
+        .add_hbar_transfer_with_hook(sender_id, Hbar::from_tinybars(-100), fungible_hook_call)
         .hbar_transfer(receiver_id, Hbar::from_tinybars(100))
         .freeze_with(&client)?
         .sign(sender_key)
@@ -247,7 +247,7 @@ async fn can_transfer_fungible_token_with_hook() -> anyhow::Result<()> {
 
     // Perform token transfer with hook
     let transfer_receipt = TransferTransaction::new()
-        .token_transfer_with_hook(token_id, sender_id, -10, fungible_hook_call)
+        .add_token_transfer_with_hook(token_id, sender_id, -10, fungible_hook_call)
         .token_transfer(token_id, receiver_id, 10)
         .freeze_with(&client)?
         .sign(sender_key)
@@ -342,13 +342,18 @@ async fn can_transfer_nft_with_sender_hook() -> anyhow::Result<()> {
     let hook_call = HookCall::new(Some(1), Some(evm_hook_call));
     let sender_nft_hook_call = NftHookCall { hook_call, hook_type: NftHookType::PreHookSender };
 
-    // Perform NFT transfer with sender hook
+    // Perform NFT transfer with sender hook (receiver hook is dummy/empty)
+    let dummy_receiver_hook = NftHookCall {
+        hook_call: HookCall::new(None, None),
+        hook_type: NftHookType::PreHookReceiver,
+    };
     let transfer_receipt = TransferTransaction::new()
-        .nft_transfer_with_sender_hook(
+        .add_nft_transfer_with_hook(
             token_id.nft(serial_number),
             sender_id,
             receiver_id,
             sender_nft_hook_call,
+            dummy_receiver_hook,
         )
         .freeze_with(&client)?
         .sign(sender_key)
@@ -443,12 +448,15 @@ async fn can_transfer_nft_with_receiver_hook() -> anyhow::Result<()> {
     let hook_call = HookCall::new(Some(1), Some(evm_hook_call));
     let receiver_nft_hook_call = NftHookCall { hook_call, hook_type: NftHookType::PreHookReceiver };
 
-    // Perform NFT transfer with receiver hook
+    // Perform NFT transfer with receiver hook (sender hook is dummy/empty)
+    let dummy_sender_hook =
+        NftHookCall { hook_call: HookCall::new(None, None), hook_type: NftHookType::PreHookSender };
     let transfer_receipt = TransferTransaction::new()
-        .nft_transfer_with_receiver_hook(
+        .add_nft_transfer_with_hook(
             token_id.nft(serial_number),
             sender_id,
             receiver_id,
+            dummy_sender_hook,
             receiver_nft_hook_call,
         )
         .freeze_with(&client)?
@@ -556,7 +564,7 @@ async fn can_transfer_nft_with_both_sender_and_receiver_hooks() -> anyhow::Resul
 
     // Perform NFT transfer with both hooks
     let transfer_receipt = TransferTransaction::new()
-        .nft_transfer_with_both_hooks(
+        .add_nft_transfer_with_hook(
             token_id.nft(serial_number),
             sender_id,
             receiver_id,