Remove unnecessary passing of pumpModel

ps2 · Oct 20, 2016 · 6ce4626 · 6ce4626
1 parent cf0a853
commit 6ce4626
Show file tree

Hide file tree

Showing 29 changed files with 37 additions and 53 deletions.
diff --git a/MinimedKit/GlucoseEvents/BatteryChangeGlucoseEvent.swift b/MinimedKit/GlucoseEvents/BatteryChangeGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct BatteryChangeGlucoseEvent : GlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/CalBGForGHGlucoseEvent.swift b/MinimedKit/GlucoseEvents/CalBGForGHGlucoseEvent.swift
@@ -14,7 +14,7 @@ public struct CalBGForGHGlucoseEvent : GlucoseEvent {
     public let timestamp: DateComponents
     public let amount: Int
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 6
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/DataEndGlucoseEvent.swift b/MinimedKit/GlucoseEvents/DataEndGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct DataEndGlucoseEvent : RelativeTimestampedGlucoseEvent {
     public let rawData: Data
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 1
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/DateTimeChangeGlucoseEvent.swift b/MinimedKit/GlucoseEvents/DateTimeChangeGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct DateTimeChangeGlucoseEvent : GlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/Fokko7GlucoseEvent.swift b/MinimedKit/GlucoseEvents/Fokko7GlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct Fokko7GlucoseEvent : GlucoseEvent {
     public let rawData: Data
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 2
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/GlucoseEvent.swift b/MinimedKit/GlucoseEvents/GlucoseEvent.swift
@@ -10,7 +10,7 @@ import Foundation
 
 public protocol GlucoseEvent : DictionaryRepresentable {
 
-    init?(availableData: Data, pumpModel: PumpModel)
+    init?(availableData: Data)
 
     var rawData: Data {
         get

diff --git a/MinimedKit/GlucoseEvents/GlucoseSensorDataGlucoseEvent.swift b/MinimedKit/GlucoseEvents/GlucoseSensorDataGlucoseEvent.swift
@@ -14,7 +14,7 @@ public struct GlucoseSensorDataGlucoseEvent : RelativeTimestampedGlucoseEvent {
     public let sgv: Int
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 1
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/NineteenSomethingGlucoseEvent.swift b/MinimedKit/GlucoseEvents/NineteenSomethingGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct NineteenSomethingGlucoseEvent : RelativeTimestampedGlucoseEvent {
     public let rawData: Data
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 1
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorCalFactorGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorCalFactorGlucoseEvent.swift
@@ -14,7 +14,7 @@ public struct SensorCalFactorGlucoseEvent : ReferenceTimestampedGlucoseEvent {
     public let timestamp: DateComponents
     public let factor: Float
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 7
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorCalGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorCalGlucoseEvent.swift
@@ -14,7 +14,7 @@ public struct SensorCalGlucoseEvent : RelativeTimestampedGlucoseEvent {
     public let waiting: String
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 2
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorStatusGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorStatusGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct SensorStatusGlucoseEvent : GlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorSyncGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorSyncGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct SensorSyncGlucoseEvent : GlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorTimestampGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorTimestampGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct SensorTimestampGlucoseEvent : ReferenceTimestampedGlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/SensorWeakSignalGlucoseEvent.swift b/MinimedKit/GlucoseEvents/SensorWeakSignalGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct SensorWeakSignalGlucoseEvent : RelativeTimestampedGlucoseEvent {
     public let rawData: Data
     public var timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 1
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/TenSomethingGlucoseEvent.swift b/MinimedKit/GlucoseEvents/TenSomethingGlucoseEvent.swift
@@ -13,7 +13,7 @@ public struct TenSomethingGlucoseEvent : ReferenceTimestampedGlucoseEvent {
     public let rawData: Data
     public let timestamp: DateComponents
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 5
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucoseEvents/UnknownGlucoseEvent.swift b/MinimedKit/GlucoseEvents/UnknownGlucoseEvent.swift
@@ -14,7 +14,7 @@ public struct UnknownGlucoseEvent : GlucoseEvent {
     public var timestamp: DateComponents
     public let op: String
 
-    public init?(availableData: Data, pumpModel: PumpModel) {
+    public init?(availableData: Data) {
         length = 1
 
         guard length <= availableData.count else {

diff --git a/MinimedKit/GlucosePage.swift b/MinimedKit/GlucosePage.swift
@@ -17,7 +17,7 @@ public class GlucosePage {
 
     public let events: [GlucoseEvent]
 
-    public init(pageData: Data, pumpModel: PumpModel) throws {
+    public init(pageData: Data) throws {
 
         guard checkCRC16(pageData) else {
             events = [GlucoseEvent]()
@@ -36,16 +36,16 @@ public class GlucosePage {
             let remainingData = pageData.subdata(in: offset..<pageData.count)
             let opcode = pageData[offset] as UInt8
             if let eventType = GlucoseEventType(rawValue: opcode) {
-                if let event = eventType.eventType.init(availableData: remainingData, pumpModel: pumpModel) {
+                if let event = eventType.eventType.init(availableData: remainingData) {
                     return event
                 }
             }
 
             if opcode >= 20 {
-                return GlucoseSensorDataGlucoseEvent(availableData: remainingData, pumpModel: pumpModel)!
+                return GlucoseSensorDataGlucoseEvent(availableData: remainingData)!
             }
 
-            return UnknownGlucoseEvent(availableData: remainingData, pumpModel: pumpModel)!
+            return UnknownGlucoseEvent(availableData: remainingData)!
         }
 
         func addTimestampsToEvents(startTimestamp: DateComponents, eventsNeedingTimestamp: [RelativeTimestampedGlucoseEvent]) -> [GlucoseEvent] {

diff --git a/MinimedKitTests/GlucoseEvents/BatteryChangeGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/BatteryChangeGlucoseEventTests.swift
@@ -21,9 +21,8 @@ class BatteryChangeGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0a0bae0a0e")!
-        let subject = BatteryChangeGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = BatteryChangeGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2014, month: 2, day: 10, hour: 11, minute: 46)

diff --git a/MinimedKitTests/GlucoseEvents/CalBGForGHGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/CalBGForGHGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class CalBGForGHGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0e4f5b138fa0")!
-        let subject = CalBGForGHGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = CalBGForGHGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2015, month: 5, day: 19, hour: 15, minute: 27)

diff --git a/MinimedKitTests/GlucoseEvents/DateTimeChangeGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/DateTimeChangeGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class DateTimeChangeGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0c0ad23e0e")!
-        let subject = DateTimeChangeGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = DateTimeChangeGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2014, month: 3, day: 30, hour: 10, minute: 18)

diff --git a/MinimedKitTests/GlucoseEvents/GlucoseSensorDataGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/GlucoseSensorDataGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class GlucoseSensorDataGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "35")!
-        let subject = GlucoseSensorDataGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = GlucoseSensorDataGlucoseEvent(availableData: rawData)!
 
         XCTAssertEqual(subject.sgv, 106)
     }

diff --git a/MinimedKitTests/GlucoseEvents/SensorCalFactorGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/SensorCalFactorGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class SensorCalFactorGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0f4f67130f128c")!
-        let subject = SensorCalFactorGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorCalFactorGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2015, month: 5, day: 19, hour: 15, minute: 39)

diff --git a/MinimedKitTests/GlucoseEvents/SensorCalGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/SensorCalGlucoseEventTests.swift
@@ -22,17 +22,15 @@ class SensorCalGlucoseEventTests: XCTestCase {
     }
 
     func testDecodingMeterBgNow() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0300")!
-        let subject = SensorCalGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorCalGlucoseEvent(availableData: rawData)!
 
         XCTAssertEqual(subject.waiting, "meter_bg_now")
     }
 
     func testDecodingWaiting() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0301")!
-        let subject = SensorCalGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorCalGlucoseEvent(availableData: rawData)!
 
         XCTAssertEqual(subject.waiting, "waiting")
     }

diff --git a/MinimedKitTests/GlucoseEvents/SensorStatusGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/SensorStatusGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class SensorStatusGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0b0baf0a0e")!
-        let subject = SensorStatusGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorStatusGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2014, month: 2, day: 10, hour: 11, minute: 47)

diff --git a/MinimedKitTests/GlucoseEvents/SensorSyncGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/SensorSyncGlucoseEventTests.swift
@@ -27,9 +27,8 @@ class SensorSyncGlucoseEventTests: XCTestCase {
     }
 
     func testPerformanceExample() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "0d4d44330f")!
-        let subject = SensorSyncGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorSyncGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2015, month: 5, day: 19, hour: 13, minute: 04)

diff --git a/MinimedKitTests/GlucoseEvents/SensorTimestampGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/SensorTimestampGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class SensorTimestampGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "088d9b5d0c")!
-        let subject = SensorTimestampGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = SensorTimestampGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2012, month: 10, day: 29, hour: 13, minute: 27)

diff --git a/MinimedKitTests/GlucoseEvents/TenSomethingGlucoseEventTests.swift b/MinimedKitTests/GlucoseEvents/TenSomethingGlucoseEventTests.swift
@@ -22,9 +22,8 @@ class TenSomethingGlucoseEventTests: XCTestCase {
     }
 
     func testDecoding() {
-        let pumpModel = PumpModel.Model551
         let rawData = Data(hexadecimalString: "100bb40a0e")!
-        let subject = TenSomethingGlucoseEvent(availableData: rawData, pumpModel: pumpModel)!
+        let subject = TenSomethingGlucoseEvent(availableData: rawData)!
 
         let expectedTimestamp = DateComponents(calendar: Calendar.current,
                                                year: 2014, month: 2, day: 10, hour: 11, minute: 52)