diff --git a/swift-sdk/Internal/InAppHelper.swift b/swift-sdk/Internal/InAppHelper.swift index 25c5ffbb2..4e841509a 100644 --- a/swift-sdk/Internal/InAppHelper.swift +++ b/swift-sdk/Internal/InAppHelper.swift @@ -93,7 +93,7 @@ struct InAppHelper { } // process each parseResult and consumes failed message, if messageId is present - private static func process(parseResult: IterableResult, apiClient: ApiClientProtocol) -> IterableInAppMessage? { + private static func process(parseResult: Result, apiClient: ApiClientProtocol) -> IterableInAppMessage? { switch parseResult { case let .failure(parseError): switch parseError { diff --git a/swift-sdk/Internal/InAppMessageParser.swift b/swift-sdk/Internal/InAppMessageParser.swift index f6077a80d..1739506d9 100644 --- a/swift-sdk/Internal/InAppMessageParser.swift +++ b/swift-sdk/Internal/InAppMessageParser.swift @@ -12,7 +12,7 @@ struct InAppMessageParser { /// Given json payload, It will construct array of IterableInAppMessage or ParseError /// The caller needs to make sure to consume errored out messages - static func parse(payload: [AnyHashable: Any]) -> [IterableResult] { + static func parse(payload: [AnyHashable: Any]) -> [Result] { return getInAppDicts(fromPayload: payload).map { let oneJson = preProcessOneJson(fromJson: $0) @@ -77,7 +77,7 @@ struct InAppMessageParser { } } - private static func parseOneMessage(fromJson json: [AnyHashable: Any]) -> IterableResult { + private static func parseOneMessage(fromJson json: [AnyHashable: Any]) -> Result { guard let messageId = json[JsonKey.messageId.jsonKey] as? String else { return .failure(.parseFailed(reason: "no messageId", messageId: nil)) } diff --git a/swift-sdk/Internal/IterableUtil.swift b/swift-sdk/Internal/IterableUtil.swift index d0f5e8c05..9fec1cabf 100644 --- a/swift-sdk/Internal/IterableUtil.swift +++ b/swift-sdk/Internal/IterableUtil.swift @@ -7,12 +7,6 @@ import Foundation import os import UIKit -/// Functionality such as this will be built in for Swift 5.0. This will help with the transition -enum IterableResult { - case success(T) - case failure(E) -} - @objc final class IterableUtil: NSObject { static var rootViewController: UIViewController? { if let rootViewController = UIApplication.shared.delegate?.window??.rootViewController { diff --git a/tests/common/Common.swift b/tests/common/Common.swift index 593e73db1..0f1792690 100644 --- a/tests/common/Common.swift +++ b/tests/common/Common.swift @@ -45,7 +45,7 @@ struct InAppTestHelper { return InAppMessageParser.parse(payload: payload).compactMap(parseResultToOptionalMessage) } - private static func parseResultToOptionalMessage(result: IterableResult) -> IterableInAppMessage? { + private static func parseResultToOptionalMessage(result: Result) -> IterableInAppMessage? { switch result { case .failure: return nil