From 0617b42287bac1eeb409c312f221293fe310b384 Mon Sep 17 00:00:00 2001 From: Alex Usbergo Date: Sun, 28 Jun 2020 10:52:17 +0200 Subject: [PATCH] minor API fixes --- Sources/Store/concurrency/Executor.swift | 2 +- Sources/Store/serialization/Signpost.swift | 2 +- Sources/Store/transactions/Transaction.swift | 8 ++++---- Sources/Store/transactions/TransactionContext.swift | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Sources/Store/concurrency/Executor.swift b/Sources/Store/concurrency/Executor.swift index 0927f02..e98c647 100644 --- a/Sources/Store/concurrency/Executor.swift +++ b/Sources/Store/concurrency/Executor.swift @@ -32,7 +32,7 @@ public final class Executor { transactions: [AnyTransaction], handler: TransactionCompletion = nil ) { - let error = AnyError() + let error = ErrorStorage() var completionOperation: Operation? if let completionHandler = handler { /// Wraps the completion handler in an operation. diff --git a/Sources/Store/serialization/Signpost.swift b/Sources/Store/serialization/Signpost.swift index 1c0d184..82f60f8 100644 --- a/Sources/Store/serialization/Signpost.swift +++ b/Sources/Store/serialization/Signpost.swift @@ -10,7 +10,7 @@ public final class SignpostTransaction: AnyTransaction { public let id: String = PushID.default.make() public let strategy: Executor.Strategy = .async(nil) - public var error: AnyError? = nil + public var error: ErrorStorage? = nil /// - note: Never set because `SignpostTransaction`s do not have a backing operation. public var operation: AsyncOperation { diff --git a/Sources/Store/transactions/Transaction.swift b/Sources/Store/transactions/Transaction.swift index 9c71ddc..de0d735 100644 --- a/Sources/Store/transactions/Transaction.swift +++ b/Sources/Store/transactions/Transaction.swift @@ -34,7 +34,7 @@ public protocol AnyTransaction: class, Cancellable { var strategy: Executor.Strategy { get } /// Tracks any error that might have been raised in this transaction group. - var error: AnyError? { get set } + var error: ErrorStorage? { get set } /// Represents the transaction execution progress. /// Trackable `@Published` property. @@ -93,7 +93,7 @@ public final class Transaction: AnyTransaction, Identifiable { public var actionId: String { action.id } public let id: String = PushID.default.make() public var strategy = Executor.Strategy.async(nil) - public var error: AnyError? + public var error: ErrorStorage? public var opaqueStoreRef: AnyStore? { set { guard let newValue = newValue as? A.AssociatedStoreType else { return } @@ -154,7 +154,7 @@ public final class Transaction: AnyTransaction, Identifiable { let context = TransactionContext( operation: operation, store: store, - errorRef: error, + errorStorage: error, transaction: self) action.reduce(context: context) } @@ -189,7 +189,7 @@ public final class Transaction: AnyTransaction, Identifiable { let context = TransactionContext( operation: operation, store: store, - errorRef: error, + errorStorage: error, transaction: self) action.cancel(context: context) context.reject(error: error.error!) diff --git a/Sources/Store/transactions/TransactionContext.swift b/Sources/Store/transactions/TransactionContext.swift index 4d3692b..90fd8bb 100644 --- a/Sources/Store/transactions/TransactionContext.swift +++ b/Sources/Store/transactions/TransactionContext.swift @@ -8,9 +8,9 @@ public struct TransactionContext { /// The target store for this transaction. public let store: S /// Error internal storage. - public var errorRef = AnyError() + public var errorStorage = ErrorStorage() /// Last recorded error in this dispatch group. - public var error: Error? { errorRef.error } + public var error: Error? { errorStorage.error } /// The current transaction. public let transaction: Transaction @@ -31,7 +31,7 @@ public struct TransactionContext { /// Terminates this operation with an error. public func reject(error: Error) { - self.errorRef.error = error + self.errorStorage.error = error operation.finish() } @@ -41,8 +41,8 @@ public struct TransactionContext { } } -// MARK: - ErrorRef +// MARK: - errorStorage -public final class AnyError { +public final class ErrorStorage { public var error: Error? }