Skip to content

Commit

Permalink
Use more idiomatic Swift styling
Browse files Browse the repository at this point in the history
    - Use labels for function parameters
    - Use Bytes instead of [UInt8] array
  • Loading branch information
janaakhterov authored and qtbeee committed Nov 6, 2019
1 parent 3e5da59 commit 68767cd
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
9 changes: 5 additions & 4 deletions Sources/Hedera/file/FileAppendTransaction.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SwiftProtobuf
import Foundation
import Sodium

public class FileAppendTransaction: TransactionBuilder {
public override init(client: Client) {
Expand All @@ -9,28 +10,28 @@ public class FileAppendTransaction: TransactionBuilder {
}

@discardableResult
public func setContents(_ data: Data) -> Self {
public func setContents(data: Data) -> Self {
body.fileAppend.contents = data

return self
}

@discardableResult
public func setContents(_ bytes: [UInt8]) -> Self {
public func setContents(bytes: Bytes) -> Self {
body.fileAppend.contents = Data(bytes)

return self
}

@discardableResult
public func setContents(_ string: String) -> Self {
public func setContents(string: String) -> Self {
body.fileAppend.contents = Data(Array(string.utf8))

return self
}

@discardableResult
public func setFile(_ id: FileId) -> Self {
public func setFile(id: FileId) -> Self {
body.fileAppend.fileID = id.toProto()

return self
Expand Down
11 changes: 5 additions & 6 deletions Sources/Hedera/file/FileCreateTransaction.swift
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import SwiftProtobuf
import Foundation
import Sodium

public class FileCreateTransaction: TransactionBuilder {
public override init(client: Client) {
super.init(client: client)

body.fileCreate = Proto_FileCreateTransactionBody()

// Warning: result of call is unused
// method return `self` though
_ = setExpirationTime(Int64(NSDate.init().timeIntervalSince1970) + 7898, 0)
setExpirationTime(Date(timeIntervalSinceNow: 7898))
}

@discardableResult
Expand All @@ -27,21 +26,21 @@ public class FileCreateTransaction: TransactionBuilder {
}

@discardableResult
public func setContents(_ data: Data) -> Self {
public func setContents(data: Data) -> Self {
body.fileCreate.contents = data

return self
}

@discardableResult
public func setContents(_ bytes: [UInt8]) -> Self {
public func setContents(bytes: Bytes) -> Self {
body.fileCreate.contents = Data(bytes)

return self
}

@discardableResult
public func setContents(_ string: String) -> Self {
public func setContents(string: String) -> Self {
body.fileCreate.contents = Data(Array(string.utf8))

return self
Expand Down
2 changes: 1 addition & 1 deletion Sources/Hedera/file/FileDeleteTransaction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class FileDeleteTransaction: TransactionBuilder {
}

@discardableResult
public func setFile(_ id: FileId) -> Self {
public func setFile(id: FileId) -> Self {
body.fileDelete.fileID = id.toProto()

return self
Expand Down
11 changes: 6 additions & 5 deletions Sources/Hedera/file/FileUpdateTransaction.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SwiftProtobuf
import Foundation
import Sodium

public class FileUpdateTransaction: TransactionBuilder {
public override init(client: Client) {
Expand All @@ -9,35 +10,35 @@ public class FileUpdateTransaction: TransactionBuilder {
}

@discardableResult
public func setExpirationTime(_ date: Date) -> Self {
public func setExpirationTime(date: Date) -> Self {
body.fileUpdate.expirationTime = date.toProto()

return self
}

@discardableResult
public func setContents(_ data: Data) -> Self {
public func setContents(data: Data) -> Self {
body.fileUpdate.contents = data

return self
}

@discardableResult
public func setContents(_ bytes: [UInt8]) -> Self {
public func setContents(bytes: Bytes) -> Self {
body.fileUpdate.contents = Data(bytes)

return self
}

@discardableResult
public func setContents(_ string: String) -> Self {
public func setContents(string: String) -> Self {
body.fileUpdate.contents = Data(Array(string.utf8))

return self
}

@discardableResult
public func setFile(_ id: FileId) -> Self {
public func setFile(id: FileId) -> Self {
body.fileUpdate.fileID = id.toProto()

return self
Expand Down

0 comments on commit 68767cd

Please sign in to comment.