Resolve Comments

- Use Date for `setExpirationTime` - Use Uint64 and convert to Int64 - Remove `Id` from `setContractId` - Add `setContract` to `ContractExecuteTransaction`
hiero-ledger · Nov 6, 2019 · a783e31 · a783e31
1 parent 257009b
commit a783e31
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 16 deletions.
diff --git a/Sources/Hedera/contract/ContractCreateTransaction.swift b/Sources/Hedera/contract/ContractCreateTransaction.swift
@@ -8,43 +8,50 @@ public class ContractCreateTransaction: TransactionBuilder {
         body.contractCreateInstance = Proto_ContractCreateTransactionBody()
     }
 
+    @discardableResult
     public func setAdminKey(_ key: Ed25519PublicKey) -> Self {
         body.contractCreateInstance.adminKey = key.toProto()
 
         return self
     }
 
+    @discardableResult
     public func setAutoRenewPeriod(_ period: TimeInterval) -> Self {
         body.contractCreateInstance.autoRenewPeriod = period.toProto()
 
         return self
     }
 
 
+    @discardableResult
     public func setBytecodeFile(_ id: FileId) -> Self {
         body.contractCreateInstance.fileID = id.toProto()
 
         return self
     }
 
+    @discardableResult
     public func setConstuctorParams(_ bytes: [UInt8]) -> Self {
         body.contractCreateInstance.constructorParameters = Data(bytes)
 
         return self
     }
 
-    public func setGas(_ gas: Int64) -> Self {
-        body.contractCreateInstance.gas = gas
+    @discardableResult
+    public func setGas(_ gas: UInt64) -> Self {
+        body.contractCreateInstance.gas = Int64(gas)
 
         return self        
     }
 
-    public func setInitialBalance(_ balance: Int64) -> Self {
-        body.contractCreateInstance.initialBalance = balance
+    @discardableResult
+    public func setInitialBalance(_ balance: UInt64) -> Self {
+        body.contractCreateInstance.initialBalance = Int64(balance)
 
         return self
     }
 
+    @discardableResult
     public func setProxyAccount(_ id: AccountId) -> Self {
         body.contractCreateInstance.proxyAccountID = id.toProto()
 

diff --git a/Sources/Hedera/contract/ContractDeleteTransaction.swift b/Sources/Hedera/contract/ContractDeleteTransaction.swift
@@ -8,7 +8,8 @@ public class ContractDeleteTransaction: TransactionBuilder {
         body.contractDeleteInstance = Proto_ContractDeleteTransactionBody()
     }
 
-    public func setContractId(_ id: ContractId) -> Self {
+    @discardableResult
+    public func setContract(_ id: ContractId) -> Self {
         body.contractDeleteInstance.contractID = id.toProto()
 
         return self

diff --git a/Sources/Hedera/contract/ContractExecuteTransaction.swift b/Sources/Hedera/contract/ContractExecuteTransaction.swift
@@ -8,32 +8,44 @@ public class ContractExecuteTransaction: TransactionBuilder {
         body.contractCall = Proto_ContractCallTransactionBody()
     }
 
-    public func setAmount(_ amount: Int64) -> Self {
-        body.contractCall.amount = amount
+    @discardableResult
+    public func setAmount(_ amount: UInt64) -> Self {
+        body.contractCall.amount = Int64(amount)
 
         return self
     }
 
+    @discardableResult
+    public func setContract(_ id: ContractId) -> Self {
+        body.contractCall.contractID = id.toProto()
+
+        return self
+    }
+
+    @discardableResult
     public func setFunctionParameters(_ bytes: [UInt8]) -> Self {
         body.contractCall.functionParameters = Data(bytes)
 
         return self
     }
 
+    @discardableResult
     public func setFunctionParameters(_ data: Data) -> Self {
         body.contractCall.functionParameters = data
 
         return self
     }
 
+    @discardableResult
     public func setFunctionParameters(_ params: String) -> Self {
         body.contractCall.functionParameters = Data(Array(params.utf8))
 
         return self
     }
 
-    public func setGas(_ gas: Int64) -> Self {
-        body.contractCall.gas = gas
+    @discardableResult
+    public func setGas(_ gas: UInt64) -> Self {
+        body.contractCall.gas = Int64(gas)
 
         return self        
     }

diff --git a/Sources/Hedera/contract/ContractUpdateTransaction.swift b/Sources/Hedera/contract/ContractUpdateTransaction.swift
@@ -8,40 +8,42 @@ public class ContractUpdateTransaction: TransactionBuilder {
         body.contractUpdateInstance = Proto_ContractUpdateTransactionBody()
     }
 
+    @discardableResult
     public func setAdminKey(_ key: Ed25519PublicKey) -> Self {
         body.contractUpdateInstance.adminKey = key.toProto()
 
         return self
     }
 
+    @discardableResult
     public func setAutoRenewPeriod(_ period: TimeInterval) -> Self {
         body.contractUpdateInstance.autoRenewPeriod = period.toProto()
 
         return self
     }
 
+    @discardableResult
     public func setBytecodeFile(_ id: FileId) -> Self {
         body.contractUpdateInstance.fileID = id.toProto()
 
         return self
     }
 
-    public func setContractId(_ id: ContractId) -> Self {
+    @discardableResult
+    public func setContract(_ id: ContractId) -> Self {
         body.contractUpdateInstance.contractID = id.toProto()
 
         return self
     }
 
-    public func setExpirationTime(_ seconds: Int64, _ nanos: Int32) -> Self {
-        var expirationTime = Proto_Timestamp()
-        expirationTime.seconds = seconds
-        expirationTime.nanos = nanos
-
-        body.fileCreate.expirationTime = expirationTime
+    @discardableResult
+    public func setExpirationTime(_ date: Date) -> Self {
+        body.fileCreate.expirationTime = date.toProto()
 
         return self
     }
 
+    @discardableResult
     public func setProxyAccount(_ id: AccountId) -> Self {
         body.contractUpdateInstance.proxyAccountID = id.toProto()