Bring CryptoTransfer to parity

hiero-ledger · Jan 6, 2020 · 4e59f0d · 4e59f0d
1 parent 0ce344e
commit 4e59f0d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Examples/TransferCrypto/main.swift b/Examples/TransferCrypto/main.swift
@@ -23,8 +23,8 @@ let client = clientFromEnvironment(eventLoopGroup: eventLoopGroup)
     .setMaxTransactionFee(100_000_000)
 
 let tx = CryptoTransferTransaction()
-    .add(sender: AccountId("0.0.3")!, amount: 10000)
-    .add(recipient: AccountId("0.0.2")!, amount: 10000)
+    .addSender(AccountId("0.0.3")!, amount: 10000)
+    .addRecipient(AccountId("0.0.2")!, amount: 10000)
     .setMemo("Transfer Crypto Example - Swift SDK")
     .build(client: client)
 

diff --git a/Sources/Hedera/QueryBuilder.swift b/Sources/Hedera/QueryBuilder.swift
@@ -51,8 +51,8 @@ public class QueryBuilder<Response> {
 
         header.responseType = Proto_ResponseType.costAnswer
         header.payment = CryptoTransferTransaction()
-            .add(sender: client.operator!.id, amount: 0)
-            .add(recipient: node.accountId, amount: 0)
+            .addSender(client.operator!.id, amount: 0)
+            .addRecipient(node.accountId, amount: 0)
             .build(client: client)
             .addSigPair(publicKey: client.operator!.publicKey, signer: client.operator!.signer)
             .toProto()
@@ -142,8 +142,8 @@ public class QueryBuilder<Response> {
     func generateQueryPaymentTransaction(client: Client, node: Node, amount: UInt64) {
         let tx = CryptoTransferTransaction()
             .setNodeAccount(node.accountId)
-            .add(sender: client.operator!.id, amount: amount)
-            .add(recipient: node.accountId, amount: amount)
+            .addSender(client.operator!.id, amount: amount)
+            .addRecipient(node.accountId, amount: amount)
             .setMaxTransactionFee(defaultMaxTransactionFee)
             .build(client: client)
             .addSigPair(publicKey: client.operator!.publicKey, signer: client.operator!.signer)

diff --git a/Sources/Hedera/account/CryptoTransferTransaction.swift b/Sources/Hedera/account/CryptoTransferTransaction.swift
@@ -9,17 +9,17 @@ public final class CryptoTransferTransaction: TransactionBuilder {
     }
 
     @discardableResult
-    public func add(sender: AccountId, amount: UInt64) -> Self {
-        add(account: sender, amount: -Int64(amount))
+    public func addSender(_ sender: AccountId, amount: UInt64) -> Self {
+        addTransfer(account: sender, amount: -Int64(amount))
     }
 
     @discardableResult
-    public func add(recipient: AccountId, amount: UInt64) -> Self {
-        add(account: recipient, amount: Int64(amount))
+    public func addRecipient(_ recipient: AccountId, amount: UInt64) -> Self {
+        addTransfer(account: recipient, amount: Int64(amount))
     }
 
     @discardableResult
-    public func add(account: AccountId, amount: Int64) -> Self {
+    public func addTransfer(account: AccountId, amount: Int64) -> Self {
         var accountAmount = Proto_AccountAmount()
         accountAmount.accountID = account.toProto()
         accountAmount.amount = amount