Update decode method

Outblock · Nov 24, 2022 · ffc5fb5 · ffc5fb5
1 parent 101a415
commit ffc5fb5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Sources/Flow/Decode/FlowArgument+Decode.swift b/Sources/Flow/Decode/FlowArgument+Decode.swift
@@ -22,7 +22,7 @@ import Foundation
 protocol FlowCodable {
     func decode() -> Any?
 
-    func decode<T: Decodable>(_ decodable: T.Type) throws -> T?
+    func decode<T: Decodable>(_ decodable: T.Type) throws -> T
 
     func decode<T: Decodable>() throws -> T
 }
@@ -50,7 +50,7 @@ extension Flow.Argument: FlowCodable {
         }
     }
 
-    public func decode<T: Decodable>(_: T.Type) throws -> T? {
+    public func decode<T: Decodable>(_: T.Type) throws -> T {
         do {
             let result: T = try decode()
             return result

diff --git a/Sources/Flow/Models/FlowEvent.swift b/Sources/Flow/Models/FlowEvent.swift
@@ -116,8 +116,11 @@ extension Flow.Event.Payload: FlowCodable {
         return fields?.decode()
     }
 
-    public func decode<T: Decodable>(_ decodable: T.Type) throws -> T? {
-        return try fields?.decode(decodable)
+    public func decode<T: Decodable>(_ decodable: T.Type) throws -> T {
+        guard let result: T = try? fields?.decode() else {
+            throw Flow.FError.decodeFailure
+        }
+        return result
     }
 
     public func decode<T: Decodable>() throws -> T {

diff --git a/Sources/Flow/Models/FlowScript.swift b/Sources/Flow/Models/FlowScript.swift
@@ -67,8 +67,11 @@ extension Flow.ScriptResponse: FlowCodable {
         return fields?.decode()
     }
 
-    public func decode<T: Decodable>(_ decodable: T.Type) throws -> T? {
-        return try fields?.decode(decodable)
+    public func decode<T: Decodable>(_ decodable: T.Type) throws -> T {
+        guard let result: T = try? fields?.decode() else {
+            throw Flow.FError.decodeFailure
+        }
+        return result
     }
 
     public func decode<T: Decodable>() throws -> T {

diff --git a/Tests/FlowAccessAPIOnSandboxTests.swift b/Tests/FlowAccessAPIOnSandboxTests.swift
@@ -24,4 +24,9 @@ final class FlowAccessAPIOnSandboxTests: XCTestCase {
         let isConnected = try await flowAPI.ping()
         XCTAssertTrue(isConnected)
     }
+
+    func testFlowAccount() async throws {
+        let account = try await flow.getAccountAtLatestBlock(address: "0x4e8e130b4fb9aee2")
+        XCTAssertNotNil(account)
+    }
 }