Fix QueryBuilder

- Implement FileInfoQuery - Implement FileInfoQueryExample - Implement Transaction from bytes - Update FileId to new spec
hiero-ledger · Nov 6, 2019 · 5664aa2 · 5664aa2
1 parent 1f85647
commit 5664aa2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/Sources/Hedera/QueryBuilder.swift b/Sources/Hedera/QueryBuilder.swift
@@ -8,6 +8,7 @@ public class QueryBuilder<Response> {
     let client: Client
     var header = Proto_QueryHeader()
     var node: Node
+    var needsPayment = true
 
     init(client: Client) {
         self.client = client
@@ -32,6 +33,7 @@ public class QueryBuilder<Response> {
     @discardableResult
     public func setPayment(_ transaction: Transaction) -> Self {
         header.payment = transaction.toProto()
+        needsPayment = false
 
         return self
     }
@@ -90,16 +92,18 @@ public class QueryBuilder<Response> {
     }
 
     public func execute() throws -> Response {
-        // if let maxQueryPayment = client.maxQueryPayment, header.hasPayment {
+        if needsPayment {
             let cost = try requestCost()
-        print("supposedly this query will cost \(cost) tinybar")
-            // if cost > maxQueryPayment {
-            //     throw HederaError(message: "Query payment exceeds maxQueryPayment")
-            // }
-
-            setPayment(1_000_000_000)
-        // }
-
+
+            if let maxQueryPayment = client.maxQueryPayment {
+                if cost > maxQueryPayment {
+                    throw HederaError(message: "Query payment exceeds maxQueryPayment")
+                }
+            }
+
+            setPayment(cost)
+        }
+
         let response = try executeClosure(client.grpcClient(for: node))
 
         var resHeader: Proto_ResponseHeader

diff --git a/Sources/Hedera/file/FileInfoQuery.swift b/Sources/Hedera/file/FileInfoQuery.swift
@@ -28,9 +28,6 @@ public class FileInfoQuery: QueryBuilder<FileInfo> {
         _ grpc: HederaGRPCClient
     ) throws -> Proto_Response {
         body.fileGetInfo.header = header
-
-//        print("the whole query \n\(Transaction(client, bytes: try! body.fileGetInfo.serializedData()))")
-
         return try grpc.fileService.getFileInfo(body)
     }
 
@@ -39,11 +36,11 @@ public class FileInfoQuery: QueryBuilder<FileInfo> {
         let fileId = fileInfo.fileID
 
         return FileInfo(
-            fileId: EntityId(
+            fileId: FileId(EntityId(
                 shard: UInt64(fileId.shardNum), 
                 realm: UInt64(fileId.realmNum),
                 num: UInt64(fileId.fileNum)
-            ),
+            )),
             size: UInt64(fileInfo.size),
             expirationTime: Date(fileInfo.expirationTime),
             deleted: fileInfo.deleted