Merge pull request #9 from LoopKit/pump-event-store-update

Updates to match protocol changes in LoopKit

Author: ps2

MinimedKit/PumpManager/MinimedPumpManager.swift

@@ -772,7 +772,7 @@ extension MinimedPumpManager {
 
                         self.log.default("Reporting new pump events: %{public}@", String(describing: remainingHistoryEvents + pendingEvents))
 
-                        delegate.pumpManager(self, hasNewPumpEvents: remainingHistoryEvents + pendingEvents, lastReconciliation: self.state.lastReconciliation, completion: { (error) in
+                        delegate.pumpManager(self, hasNewPumpEvents: remainingHistoryEvents + pendingEvents, lastReconciliation: self.state.lastReconciliation, replacePendingEvents: true) { (error) in
                             // Called on an unknown queue by the delegate
                             if error == nil {
                                 self.recents.lastAddedPumpEvents = self.dateGenerator()
@@ -793,7 +793,7 @@ extension MinimedPumpManager {
                                 })
                             }
                             completion(error)
-                        })
+                        }
                     })
                 } catch let error {
                     self.troubleshootPumpComms(using: device)
@@ -815,15 +815,15 @@ extension MinimedPumpManager {
                 preconditionFailure("pumpManagerDelegate cannot be nil")
             }
 
-            delegate.pumpManager(self, hasNewPumpEvents: events, lastReconciliation: self.state.lastReconciliation, completion: { (error) in
+            delegate.pumpManager(self, hasNewPumpEvents: events, lastReconciliation: self.state.lastReconciliation, replacePendingEvents: true) { (error) in
                 // Called on an unknown queue by the delegate
                 if let error = error {
                     self.log.error("Pump event storage failed: %{public}@", String(describing: error))
                     completion(MinimedPumpManagerError.storageFailure)
                 } else {
                     completion(nil)
                 }
-            })
+            }
         })
     }
 

MinimedKitTests/Mocks/MockPumpManagerDelegate.swift

@@ -30,7 +30,7 @@ class MockPumpManagerDelegate: PumpManagerDelegate {
 
     var reportedPumpEvents: [(events: [NewPumpEvent], lastReconciliation: Date?)] = []
 
-    func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastReconciliation: Date?, completion: @escaping (Error?) -> Void) {
+    func pumpManager(_ pumpManager: PumpManager, hasNewPumpEvents events: [NewPumpEvent], lastReconciliation: Date?, replacePendingEvents: Bool, completion: @escaping (Error?) -> Void) {
         reportedPumpEvents.append((events: events, lastReconciliation: lastReconciliation))
         completion(nil)
     }