Remove FunctionResult as it was based on an old broken version of the…

… JS SDK
hiero-ledger · Jan 3, 2020 · 85a9362 · 85a9362
1 parent d16304f
commit 85a9362
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 101 deletions.
diff --git a/Sources/Hedera/FunctionResult.swift b/Sources/Hedera/FunctionResult.swift
diff --git a/Sources/Hedera/TransactionRecord.swift b/Sources/Hedera/TransactionRecord.swift
@@ -8,7 +8,7 @@ public struct TransactionRecord {
     let transactionId: TransactionId
     let memo: String
     let transactionFee: UInt64
-    let contractResult: ContractResultType?
+    // let contractResult: ContractResultType?
     let transferList: [AccountAmount]
 
     init(_ proto: Proto_TransactionRecord) {
@@ -18,7 +18,7 @@ public struct TransactionRecord {
         self.transactionId = TransactionId(proto.transactionID)!
         self.memo = proto.memo
         self.transactionFee = UInt64(proto.transactionFee)
-        self.contractResult = ContractResultType(proto.body)
+        // self.contractResult = ContractResultType(proto.body)
         self.transferList = proto.transferList.accountAmounts.map { AccountAmount($0) }
     }
 }
@@ -33,20 +33,20 @@ public struct AccountAmount {
     }
 }
 
-public enum ContractResultType {
-    case call(FunctionResult)
-    case create(FunctionResult)
+// public enum ContractResultType {
+//     case call(FunctionResult)
+//     case create(FunctionResult)
 
-    init?(_ body: Proto_TransactionRecord.OneOf_Body?) {
-        if let body = body {
-            switch body {
-            case .contractCallResult(let result):
-                self = ContractResultType.call(FunctionResult(result))
-            case .contractCreateResult(let result):
-                self = ContractResultType.create(FunctionResult(result))
-            }
-        } else {
-            return nil
-        }
-    }
-}
+//     init?(_ body: Proto_TransactionRecord.OneOf_Body?) {
+//         if let body = body {
+//             switch body {
+//             case .contractCallResult(let result):
+//                 self = ContractResultType.call(FunctionResult(result))
+//             case .contractCreateResult(let result):
+//                 self = ContractResultType.create(FunctionResult(result))
+//             }
+//         } else {
+//             return nil
+//         }
+//     }
+// }
diff --git a/Sources/Hedera/contract/ContractCallLocalQuery.swift b/Sources/Hedera/contract/ContractCallLocalQuery.swift
@@ -1,7 +1,7 @@
 import Sodium
 import Foundation
 
-public class ContractCallLocalQuery: QueryBuilder<FunctionResult> {
+public class ContractCallLocalQuery: QueryBuilder<Void> {
     public override init(node: Node) {
         super.init(node: node)
 
@@ -27,11 +27,11 @@ public class ContractCallLocalQuery: QueryBuilder<FunctionResult> {
         return self
     }
 
-    override func mapResponse(_ response: Proto_Response) -> Result<FunctionResult, HederaError> {
+    override func mapResponse(_ response: Proto_Response) -> Result<Void, HederaError> {
         guard case .contractCallLocal(let response) =  response.response else {
             return .failure(HederaError(message: "query response was not of type 'contractCallLocal'"))
         }
 
-        return .success(FunctionResult(response.functionResult))
+        return .success(())
     }
 }