Resolve Comments

- Use unnamed for single parameter functions - Consistently use `Parameters`
hiero-ledger · Nov 6, 2019 · 0170d28 · 0170d28
1 parent 1b9229f
commit 0170d28
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 53 deletions.
diff --git a/Sources/Hedera/contract/ContractCreateTransaction.swift b/Sources/Hedera/contract/ContractCreateTransaction.swift
@@ -25,33 +25,26 @@ public class ContractCreateTransaction: TransactionBuilder {
 
 
     @discardableResult
-    public func setBytecodeFile(id: FileId) -> Self {
+    public func setBytecodeFile(_ id: FileId) -> Self {
         body.contractCreateInstance.fileID = id.toProto()
 
         return self
     }
 
     @discardableResult
-    public func setConstuctorParams(bytes: Bytes) -> Self {
+    public func setConstructorParameters(_ bytes: Bytes) -> Self {
         body.contractCreateInstance.constructorParameters = Data(bytes)
 
         return self
     }
 
     @discardableResult
-    public func setConstuctorParams(data: Data) -> Self {
+    public func setConstructorParameters(_ data: Data) -> Self {
         body.contractCreateInstance.constructorParameters = data
 
         return self
     }
 
-    @discardableResult
-    public func setConstuctorParams(string: String) -> Self {
-        body.contractCreateInstance.constructorParameters = Data(Array(string.utf8))
-
-        return self
-    }
-
     @discardableResult
     public func setGas(_ gas: UInt64) -> Self {
         body.contractCreateInstance.gas = Int64(gas)
@@ -67,7 +60,7 @@ public class ContractCreateTransaction: TransactionBuilder {
     }
 
     @discardableResult
-    public func setProxyAccount(id: AccountId) -> Self {
+    public func setProxyAccount(_ id: AccountId) -> Self {
         body.contractCreateInstance.proxyAccountID = id.toProto()
 
         return self

diff --git a/Sources/Hedera/contract/ContractDeleteTransaction.swift b/Sources/Hedera/contract/ContractDeleteTransaction.swift
@@ -9,7 +9,7 @@ public class ContractDeleteTransaction: TransactionBuilder {
     }
 
     @discardableResult
-    public func setContract(id: ContractId) -> Self {
+    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
@@ -17,55 +17,21 @@ public class ContractExecuteTransaction: TransactionBuilder {
     }
 
     @discardableResult
-    public func setContract(id: ContractId) -> Self {
+    public func setContract(_ id: ContractId) -> Self {
         body.contractCall.contractID = id.toProto()
 
         return self
     }
 
     @discardableResult
-    public func setFunctionParameters(bytes: Bytes) -> Self {
+    public func setFunctionParameters(_ bytes: Bytes) -> Self {
         body.contractCall.functionParameters = Data(bytes)
 
         return self
     }
 
     @discardableResult
-    public func setFunctionParameters(arrayOfBytes: [Bytes]) -> Self {
-        var data = Data()
-
-        for bytes in arrayOfBytes {
-            data.append(contentsOf: bytes)
-        }
-
-        body.contractCall.functionParameters = Data(data)
-
-        return self
-    }
-
-
-    @discardableResult
-    public func setFunctionParameters(data: Data) -> Self {
-        body.contractCall.functionParameters = Data(data)
-
-        return self
-    }
-
-    @discardableResult
-    public func setFunctionParameters(string: String) -> Self {
-        body.contractCall.functionParameters = Data(Array(string.utf8))
-
-        return self
-    }
-
-    @discardableResult
-    public func setFunctionParameters(strings: [String]) -> Self {
-        var data = Data()
-
-        for string in strings {
-            data.append(contentsOf: Array(string.utf8))
-        }
-
+    public func setFunctionParameters(_ data: Data) -> Self {
         body.contractCall.functionParameters = Data(data)
 
         return self

diff --git a/Sources/Hedera/contract/ContractUpdateTransaction.swift b/Sources/Hedera/contract/ContractUpdateTransaction.swift
@@ -23,28 +23,28 @@ public class ContractUpdateTransaction: TransactionBuilder {
     }
 
     @discardableResult
-    public func setBytecodeFile(id: FileId) -> Self {
+    public func setBytecodeFile(_ id: FileId) -> Self {
         body.contractUpdateInstance.fileID = id.toProto()
 
         return self
     }
 
     @discardableResult
-    public func setContract(id: ContractId) -> Self {
+    public func setContract(_ id: ContractId) -> Self {
         body.contractUpdateInstance.contractID = id.toProto()
 
         return self
     }
 
     @discardableResult
-    public func setExpirationTime(date: Date) -> Self {
+    public func setExpirationTime(_ date: Date) -> Self {
         body.fileCreate.expirationTime = date.toProto()
 
         return self
     }
 
     @discardableResult
-    public func setProxyAccount(id: AccountId) -> Self {
+    public func setProxyAccount(_ id: AccountId) -> Self {
         body.contractUpdateInstance.proxyAccountID = id.toProto()
 
         return self