Remove store from POS dependencies

Author: staskus

Modules/Sources/PointOfSale/DependencyProviders/POSDependencyProviding.swift

@@ -2,14 +2,14 @@ import Foundation
 import WooFoundation
 import Experiments
 import protocol Yosemite.Action
+import protocol Yosemite.SessionManagerProtocol
 
 /// Main dependency provider protocol for POS module
 /// This abstracts away direct ServiceLocator access
 public protocol POSDependencyProviding {
     var analytics: POSAnalyticsProviding { get }
     var stores: POSStoresProviding { get }
     var currency: CurrencySettings { get }
-    var storage: POSStorageProviding { get }
     var featureFlags: POSFeatureFlagProviding { get }
 }
 

Modules/Sources/PointOfSale/Environment/POSEnvironmentKeys.swift

@@ -42,11 +42,6 @@ public struct POSFeatureFlagsKey: EnvironmentKey {
     public static let defaultValue: POSFeatureFlagProviding = DefaultPOSFeatureFlags()
 }
 
-/// Environment key for POS storage service
-public struct POSStorageKey: EnvironmentKey {
-    public static let defaultValue: POSStorageProviding = DefaultPOSStorage()
-}
-
 // Default implementations for testing/previews
 private struct DefaultPOSStores: POSStoresProviding {
     func dispatch(_ action: Yosemite.Action) {}
@@ -56,9 +51,6 @@ private struct DefaultPOSSessionManager: POSSessionManagerProviding {
     var defaultSite: POSSiteProviding? = nil
 }
 
-private struct DefaultPOSStorage: POSStorageProviding {
-}
-
 private struct DefaultPOSFeatureFlags: POSFeatureFlagProviding {
     func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
 }
@@ -83,9 +75,4 @@ public extension EnvironmentValues {
         get { self[POSFeatureFlagsKey.self] }
         set { self[POSFeatureFlagsKey.self] = newValue }
     }
-
-    var posStorage: POSStorageProviding {
-        get { self[POSStorageKey.self] }
-        set { self[POSStorageKey.self] = newValue }
-    }
 }

WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift

@@ -10,7 +10,6 @@ import protocol Yosemite.Action
 
 /// Adaptor that bridges main app ServiceLocator to POS dependency abstraction to support POS modularization
 final class POSServiceLocatorAdaptor: POSDependencyProviding {
-
     var analytics: POSAnalyticsProviding {
         return POSAnalyticsAdaptor()
     }
@@ -23,10 +22,6 @@ final class POSServiceLocatorAdaptor: POSDependencyProviding {
         return ServiceLocator.currencySettings
     }
 
-    var storage: POSStorageProviding {
-        return POSStorageAdaptor(storage: ServiceLocator.storageManager)
-    }
-
     var featureFlags: POSFeatureFlagProviding {
         return POSFeatureFlagAdaptor(featureFlagService: ServiceLocator.featureFlagService)
     }

WooCommerce/Classes/POS/Controllers/PointOfSaleOrderController.swift

@@ -45,7 +45,7 @@ protocol PointOfSaleOrderControllerProtocol {
          currencySettings: CurrencySettings,
          analytics: POSAnalyticsProviding,
          featureFlagService: POSFeatureFlagProviding,
-         pluginsService: PluginsServiceProtocol = PluginsService(storageManager: ServiceLocator.storageManager),
+         pluginsService: PluginsServiceProtocol,
          celebration: PaymentCaptureCelebrationProtocol = PaymentCaptureCelebration()) {
         self.orderService = orderService
         self.receiptService = receiptService

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -131,7 +131,8 @@ private extension POSTabCoordinator {
                                                                 receiptService: receiptService,
                                                                 currencySettings: serviceAdaptor.currency,
                                                                 analytics: serviceAdaptor.analytics,
-                                                                featureFlagService: serviceAdaptor.featureFlags),
+                                                                featureFlagService: serviceAdaptor.featureFlags,
+                                                                pluginsService: PluginsService(storageManager: storageManager)),
                     collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker,
                     searchHistoryService: POSSearchHistoryService(siteID: siteID),
                     popularPurchasableItemsController: PointOfSaleItemsController(

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -295,7 +295,6 @@ final class POSPreviewServices: POSDependencyProviding {
     var analytics: POSAnalyticsProviding = POSPreviewAnalytics()
     var stores: POSStoresProviding = POSPreviewStores()
     var currency: CurrencySettings = CurrencySettings()
-    var storage: POSStorageProviding = POSPreviewStorage()
     var featureFlags: POSFeatureFlagProviding = POSPreviewFeatureFlags()
 }
 
@@ -308,9 +307,6 @@ private struct POSPreviewSessionManager: POSSessionManagerProviding {
     var defaultSite: POSSiteProviding? = nil
 }
 
-private struct POSPreviewStorage: POSStorageProviding {
-}
-
 private struct POSPreviewFeatureFlags: POSFeatureFlagProviding {
     func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
 }