implement TempBasal pumpSync and confirmation

2021-05-30 18:35:33 +02:00 · 2021-05-30 18:35:33 +02:00 · 3314df7bb7
parent ebb3030169
commit 3314df7bb7
17 changed files with 222 additions and 112 deletions
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
@ -17,6 +17,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.event.PodEven
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.ActivationProgress
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.BeepType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.ResponseType
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.CommandConfirmed
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.DashHistory
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.BolusRecord
@ -28,11 +29,14 @@ import info.nightscout.androidaps.queue.commands.CustomCommand
 import info.nightscout.androidaps.utils.TimeChangeType
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.rxkotlin.blockingSubscribeBy
 import io.reactivex.rxkotlin.subscribeBy
 import org.json.JSONObject
+import java.lang.IllegalArgumentException
+import java.lang.IllegalStateException
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
@ -44,6 +48,7 @@ class OmnipodDashPumpPlugin @Inject constructor(
    private val sp: SP,
    private val profileFunction: ProfileFunction,
    private val history: DashHistory,
+    private val pumpSync: PumpSync,
    injector: HasAndroidInjector,
    aapsLogger: AAPSLogger,
    resourceHelper: ResourceHelper,
@ -151,12 +156,12 @@ class OmnipodDashPumpPlugin @Inject constructor(
    }

    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
-        return executeProgrammingCommand(
+        return executeSimpleProgrammingCommand(
            history.createRecord(
                commandType = OmnipodCommandType.SET_BASAL_PROFILE
            ),
            omnipodManager.setBasalProgram(mapProfileToBasalProgram(profile))
-        )
+        ).toPumpEnactResult()
    }

    override fun isThisProfileSet(profile: Profile): Boolean = podStateManager.basalProgram?.let {
@ -240,10 +245,10 @@ class OmnipodDashPumpPlugin @Inject constructor(

    override fun stopBolusDelivering() {
        // TODO update Treatments (?)
-        executeProgrammingCommand(
+        executeSimpleProgrammingCommand(
            history.createRecord(OmnipodCommandType.CANCEL_BOLUS),
            omnipodManager.stopBolus(),
-        )
+        ).toPumpEnactResult()
    }

    override fun setTempBasalAbsolute(
@ -253,24 +258,83 @@ class OmnipodDashPumpPlugin @Inject constructor(
        enforceNew: Boolean,
        tbrType: PumpSync.TemporaryBasalType
    ): PumpEnactResult {
-        // TODO update Treatments
-        // TODO check for existing basal
-        // check existing basal(locally and maybe? get status)
-        //   if enforceNew -> cancel it()
-        //   else -> return error that existing basal is running
-        //  set new temp basal
-        // update treatments
-        // profit
-        return executeProgrammingCommand(
-            history.createRecord(
-                commandType = OmnipodCommandType.SET_TEMPORARY_BASAL,
-                tempBasalRecord = TempBasalRecord(duration = durationInMinutes, rate = absoluteRate)
-            ),
-            omnipodManager.setTempBasal(
-                absoluteRate,
-                durationInMinutes.toShort()
+        return Completable.concat(
+            listOf(
+                observeNoActiveTempBasal(enforceNew),
+                podStateManager.observeNoActiveCommand().ignoreElements(),
+                history.createRecord(
+                    commandType = OmnipodCommandType.SET_TEMPORARY_BASAL,
+                    tempBasalRecord = TempBasalRecord(duration = durationInMinutes, rate = absoluteRate)
+                ).flatMap { podStateManager.createActiveCommand(it) }
+                    .map { pumpSyncTempBasal(it, tbrType) }
+                    .ignoreElement(),
+                omnipodManager.setTempBasal(
+                    absoluteRate,
+                    durationInMinutes.toShort()
+                ).ignoreElements(),
+                history.updateFromState(podStateManager),
+                podStateManager.updateActiveCommand()
+                    .map { handleCommandConfirmation(it) }
+                    .ignoreElement()
            )
+        ).toPumpEnactResult()
+    }
+
+    private fun pumpSyncTempBasal(
+        activeCommand: OmnipodDashPodStateManager.ActiveCommand,
+        tbrType: PumpSync.TemporaryBasalType
+    ): Boolean {
+        val historyEntry = history.getById(activeCommand.historyId)
+        val record = historyEntry.record
+        if (record == null || !(record is TempBasalRecord)) {
+            throw IllegalArgumentException("Illegal recording in history: $record. Expected a temp basal")
+        }
+        val ret = pumpSync.syncTemporaryBasalWithPumpId(
+            timestamp = historyEntry.pumpId(),
+            rate = record.rate,
+            duration = record.duration.toLong(),
+            isAbsolute = true,
+            type = tbrType,
+            pumpId = historyEntry.pumpId(),
+            pumpType = PumpType.OMNIPOD_DASH,
+            pumpSerial = serialNumber()
        )
+        aapsLogger.debug(LTag.PUMP, "Pump sync temp basal: $ret")
+        return ret
+    }
+
+    private fun observeNoActiveTempBasal(enforeNew: Boolean): Completable {
+        return Completable.create { source ->
+            val expectedState = pumpSync.expectedPumpState()
+            when {
+                expectedState.temporaryBasal == null ->
+                    source.onComplete()
+                !enforeNew ->
+                    source.onError(
+                        IllegalStateException(
+                            "Temporary basal already active and enforeNew is not set."
+                        )
+                    )
+                else -> // enforceNew == true
+                    executeSimpleProgrammingCommand(
+                        history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
+                        omnipodManager.stopTempBasal()
+                    )
+            }
+        }
+    }
+
+    private fun observeActiveTempBasal(): Completable {
+        return Completable.defer {
+            if (pumpSync.expectedPumpState().temporaryBasal != null)
+                Completable.complete()
+            else
+                Completable.error(
+                    java.lang.IllegalStateException(
+                        "There is no active basal to cancel"
+                    )
+                )
+        }
    }

    override fun setTempBasalPercent(
@ -292,13 +356,61 @@ class OmnipodDashPumpPlugin @Inject constructor(
    }

    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
-        // TODO update Treatments
-        return executeProgrammingCommand(
-            history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
-            omnipodManager.stopTempBasal()
+        return executeSimpleProgrammingCommand(
+            observeCreateHistoryEntry = history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL),
+            command = omnipodManager.stopTempBasal(),
+            pre = observeActiveTempBasal(),
+        ).toPumpEnactResult()
+    }
+
+    fun Completable.toPumpEnactResult(): PumpEnactResult {
+        return this.toSingleDefault(PumpEnactResult(injector).success(true).enacted(true))
+            .onErrorReturnItem(PumpEnactResult(injector).success(false).enacted(false))
+            .blockingGet()
+    }
+
+    private fun observeCancelTempBasal(): Completable {
+        return Completable.concat(
+            listOf(
+                observeActiveTempBasal(),
+                podStateManager.observeNoActiveCommand().ignoreElements(),
+                history.createRecord(OmnipodCommandType.CANCEL_TEMPORARY_BASAL)
+                    .flatMap { podStateManager.createActiveCommand(it) }
+                    .ignoreElement(),
+                omnipodManager.stopTempBasal().ignoreElements(),
+                history.updateFromState(podStateManager),
+                podStateManager.updateActiveCommand()
+                    .map { handleCommandConfirmation(it) }
+                    .ignoreElement()
+            )
        )
    }

+    private fun handleCommandConfirmation(confirmation: CommandConfirmed) {
+        val historyEntry = history.getById(confirmation.historyId)
+        when (historyEntry.commandType) {
+            OmnipodCommandType.CANCEL_TEMPORARY_BASAL ->
+                if (confirmation.success) {
+                    pumpSync.syncStopTemporaryBasalWithPumpId(
+                        historyEntry.createdAt,
+                        historyEntry.pumpId(),
+                        PumpType.OMNIPOD_DASH,
+                        serialNumber()
+                    )
+                }
+            OmnipodCommandType.SET_TEMPORARY_BASAL ->
+                if (!confirmation.success) {
+                    pumpSync.invalidateTemporaryBasal(historyEntry.pumpId())
+                }
+
+            else ->
+                throw IllegalArgumentException(
+                    "Don't know how to sync confirmed command of type: $historyEntry and " +
+                        "succes: ${confirmation.success}"
+                )
+        }
+    }
+
    override fun cancelExtendedBolus(): PumpEnactResult {
        // TODO i18n
        return PumpEnactResult(injector).success(false).enacted(false)
@ -414,26 +526,26 @@ class OmnipodDashPumpPlugin @Inject constructor(
    }

    private fun suspendDelivery(): PumpEnactResult {
-        return executeProgrammingCommand(
+        return executeSimpleProgrammingCommand(
            history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
            omnipodManager.suspendDelivery()
-        )
+        ).toPumpEnactResult()
    }

    private fun resumeDelivery(): PumpEnactResult {
        return profileFunction.getProfile()?.let {
-            executeProgrammingCommand(
+            executeSimpleProgrammingCommand(
                history.createRecord(OmnipodCommandType.RESUME_DELIVERY),
                omnipodManager.setBasalProgram(mapProfileToBasalProgram(it))
-            )
+            ).toPumpEnactResult()
        } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active") // TODO i18n
    }

    private fun deactivatePod(): PumpEnactResult {
-        return executeProgrammingCommand(
+        return executeSimpleProgrammingCommand(
            history.createRecord(OmnipodCommandType.DEACTIVATE_POD),
            omnipodManager.deactivatePod()
-        )
+        ).toPumpEnactResult()
    }

    private fun handleTimeChange(): PumpEnactResult {
@ -447,10 +559,10 @@ class OmnipodDashPumpPlugin @Inject constructor(
    }

    private fun playTestBeep(): PumpEnactResult {
-        return executeProgrammingCommand(
+        return executeSimpleProgrammingCommand(
            history.createRecord(OmnipodCommandType.PLAY_TEST_BEEP),
            omnipodManager.playBeep(BeepType.LONG_SINGLE_BEEP)
-        )
+        ).toPumpEnactResult()
    }

    override fun timezoneOrDSTChanged(timeChangeType: TimeChangeType) {
@ -474,50 +586,27 @@ class OmnipodDashPumpPlugin @Inject constructor(
        commandQueue.customCommand(CommandHandleTimeChange(false), null)
    }

-    private fun observeAddNewActiveCommandToHistory(observeCreateHistoryEntry: Single<String>): Observable<PodEvent> {
-        return observeCreateHistoryEntry.flatMapObservable {
-            podStateManager.createActiveCommand(it).toObservable<PodEvent>()
+    private fun executeSimpleProgrammingCommand(
+        observeCreateHistoryEntry: Single<String>,
+        command: Observable<PodEvent>,
+        pre: Completable = Completable.complete(),
+    ): Completable {
+        return Completable.concat(
+            listOf(
+                pre,
+                podStateManager.observeNoActiveCommand().ignoreElements(),
+                observeCreateHistoryEntry
+                    .flatMap { podStateManager.createActiveCommand(it) }
+                    .ignoreElement(),
+                command.ignoreElements(),
+                history.updateFromState(podStateManager),
+                podStateManager.updateActiveCommand()
+                    .map { handleCommandConfirmation(it) }
+                    .ignoreElement()
+            )
+        ).doOnError { error ->
+            aapsLogger.error(LTag.PUMP, "Error executing command", error)
+            podStateManager.maybeMarkActiveCommandFailed()
        }
    }
-
-    private fun executeProgrammingCommand(
-        observeCreateHistoryEntry: Single<String>,
-        command: Observable<PodEvent>
-    ): PumpEnactResult {
-        return Single.create<PumpEnactResult> { source ->
-            Observable.concat(
-                listOf(
-                    podStateManager.observeNoActiveCommand(),
-                    observeAddNewActiveCommandToHistory(observeCreateHistoryEntry),
-                    command,
-                    history.updateFromState(podStateManager).toObservable(),
-                    podStateManager.updateActiveCommand().toObservable(),
-                )
-            ).subscribeBy(
-                onNext = { podEvent ->
-                    aapsLogger.debug(
-                        LTag.PUMP,
-                        "Received PodEvent: $podEvent"
-                    )
-                },
-                onError = { throwable ->
-                    aapsLogger.error(LTag.PUMP, "Error executing command", throwable)
-                    // Here we assume that onError will be called only BEFORE we manage to send a command
-                    // If it gets called later, we will have the command as "not sent" in history and will not try to
-                    // get it's final status, even if it was send
-
-                    podStateManager.maybeMarkActiveCommandFailed()
-                    source.onSuccess(
-                        PumpEnactResult(injector).success(false).enacted(false).comment(throwable.toString())
-                    )
-                },
-                onComplete = {
-                    aapsLogger.debug("Command completed")
-                    source.onSuccess(
-                        PumpEnactResult(injector).success(true).enacted(true)
-                    )
-                }
-            )
-        }.blockingGet()
-    }
 }
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/event/PodEvent.kt
@ -65,6 +65,4 @@ sealed class PodEvent {
            return "ResponseReceived(command=$command, response=$response)"
        }
    }
-
-    data class CommandConfirmed(val historyId: String, val success: Boolean) : PodEvent()
 }
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/ConfirmedCommand.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/ConfirmedCommand.kt
@ -0,0 +1,3 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state
+
+class CommandConfirmed(val historyId: String, val success: Boolean)
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManager.kt
@ -8,9 +8,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.DefaultStatusResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
-import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Observable
+import io.reactivex.Single
 import java.io.Serializable
 import java.util.*

@ -66,8 +66,8 @@ interface OmnipodDashPodStateManager {
    fun updateFromPairing(uniqueId: Id, pairResult: PairResult)
    fun reset()

-    fun createActiveCommand(historyId: String): Completable
-    fun updateActiveCommand(): Maybe<PodEvent>
+    fun createActiveCommand(historyId: String): Single<ActiveCommand>
+    fun updateActiveCommand(): Maybe<CommandConfirmed>
    fun observeNoActiveCommand(): Observable<PodEvent>
    fun maybeMarkActiveCommandFailed()

--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/state/OmnipodDashPodStateManagerImpl.kt
@ -17,9 +17,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.SetUniqueIdResponse
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.response.VersionResponse
 import info.nightscout.androidaps.utils.sharedPreferences.SP
-import io.reactivex.Completable
 import io.reactivex.Maybe
 import io.reactivex.Observable
+import io.reactivex.Single
 import java.io.Serializable
 import java.util.*
 import javax.inject.Inject
@ -183,21 +183,24 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
        get() = podState.activeCommand

    @Synchronized
-    override fun createActiveCommand(historyId: String) = Completable.create { source ->
-        if (activeCommand == null) {
-            podState.activeCommand = OmnipodDashPodStateManager.ActiveCommand(
-                podState.messageSequenceNumber,
-                createdRealtime = SystemClock.elapsedRealtime(),
-                historyId = historyId
-            )
-            source.onComplete()
-        } else {
-            source.onError(
-                java.lang.IllegalStateException(
-                    "Trying to send a command " +
-                        "and the last command was not confirmed"
+    override fun createActiveCommand(historyId: String): Single<OmnipodDashPodStateManager.ActiveCommand> {
+        return Single.create { source ->
+            if (activeCommand == null) {
+                val command = OmnipodDashPodStateManager.ActiveCommand(
+                    podState.messageSequenceNumber,
+                    createdRealtime = SystemClock.elapsedRealtime(),
+                    historyId = historyId
                )
-            )
+                podState.activeCommand = command
+                source.onSuccess(command)
+            } else {
+                source.onError(
+                    java.lang.IllegalStateException(
+                        "Trying to send a command " +
+                            "and the last command was not confirmed"
+                    )
+                )
+            }
        }
    }

@ -228,7 +231,7 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
    }

    @Synchronized
-    override fun updateActiveCommand() = Maybe.create<PodEvent> { source ->
+    override fun updateActiveCommand() = Maybe.create<CommandConfirmed> { source ->
        podState.activeCommand?.run {
            logger.debug(
                "Trying to confirm active command with parameters: $activeCommand " +
@ -241,12 +244,12 @@ class OmnipodDashPodStateManagerImpl @Inject constructor(
            else {
                podState.activeCommand = null
                if (sequenceNumberOfLastProgrammingCommand == sequence)
-                    source.onSuccess(PodEvent.CommandConfirmed(historyId, true))
+                    source.onSuccess(CommandConfirmed(historyId, true))
                else
-                    source.onSuccess(PodEvent.CommandConfirmed(historyId, false))
+                    source.onSuccess(CommandConfirmed(historyId, false))
            }
-        }
-            ?: source.onComplete() // no active programming command
+        } ?: source.onComplete()
+        // no active programming command
    }

    override fun increaseEapAkaSequenceNumber(): ByteArray {
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/DashHistory.kt
@ -35,6 +35,14 @@ class DashHistory @Inject constructor(
        currentTimeMillis()
    )

+    fun getById(id: String): HistoryRecord {
+        val entry = dao.byIdBlocking(id)
+        if (entry == null) {
+            throw java.lang.IllegalArgumentException("history entry [$id] not found")
+        }
+        return historyMapper.entityToDomain(entry)
+    }
+
    @Suppress("ReturnCount")
    fun createRecord(
        commandType: OmnipodCommandType,
@ -77,7 +85,6 @@ class DashHistory @Inject constructor(
    fun updateFromState(podState: OmnipodDashPodStateManager) = Completable.defer {
        podState.activeCommand?.run {
            when {
-
                createdRealtime <= podState.lastStatusResponseReceived &&
                    sequence == podState.sequenceNumberOfLastProgrammingCommand ->
                    dao.setInitialResult(historyId, InitialResult.SENT)
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/HistoryRecord.kt
@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data

+import com.github.guepardoapps.kulid.ULID
 import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType
+import java.nio.ByteBuffer

 data class HistoryRecord(
    val id: String, // ULID
@ -11,4 +13,9 @@ data class HistoryRecord(
    val record: Record?,
    val resolvedResult: ResolvedResult?,
    val resolvedAt: Long?
-)
+) {
+    fun pumpId(): Long {
+        val entropy = ULID.getEntropy(id)
+        return ByteBuffer.wrap(entropy).getLong()
+    }
+}
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/data/Record.kt
@ -14,7 +14,7 @@ enum class BolusType {
    companion object {
        fun fromBolusInfoBolusType(type: DetailedBolusInfo.BolusType): BolusType {
            return when (type) {
-                DetailedBolusInfo.BolusType.SMB -> SMB;
+                DetailedBolusInfo.BolusType.SMB -> SMB
                else -> DEFAULT
            }
        }
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/history/database/HistoryRecordDao.kt
@ -22,6 +22,9 @@ abstract class HistoryRecordDao {
    @Query("SELECT * from historyrecords WHERE createdAt <= :since")
    abstract fun allSince(since: Long): Single<List<HistoryRecordEntity>>

+    @Query("SELECT * FROM historyrecords WHERE id = :id LIMIT 1")
+    abstract fun byIdBlocking(id: String): HistoryRecordEntity?
+
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    abstract fun saveBlocking(historyRecordEntity: HistoryRecordEntity)

--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/endecrypt/EnDecryptTest.kt
@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.endecrypt

+import info.nightscout.androidaps.extensions.toHex
 import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message.MessagePacket
-import info.nightscout.androidaps.extensions.toHex
 import org.junit.Assert
 import org.junit.Test
 import org.spongycastle.util.encoders.Hex
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/MessagePacketTest.kt
@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message

 import com.google.crypto.tink.subtle.Hex
+import info.nightscout.androidaps.extensions.toHex
 import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.Id
-import info.nightscout.androidaps.extensions.toHex
 import org.junit.Assert.assertEquals
 import org.junit.Test

--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadJoinerTest.kt
@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message

 import com.google.crypto.tink.subtle.Hex
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
 import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
 import org.junit.Assert.assertEquals
 import org.junit.Test

--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitJoinTest.kt
@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message

+import info.nightscout.androidaps.extensions.toHex
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadJoiner
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
-import info.nightscout.androidaps.extensions.toHex
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.*
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/message/PayloadSplitterTest.kt
@ -1,8 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.message

 import com.google.crypto.tink.subtle.Hex
-import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
 import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.packet.PayloadSplitter
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/KeyExchangeTest.kt
@ -1,9 +1,9 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.pair

+import info.nightscout.androidaps.extensions.toHex
 import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.RandomByteGenerator
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util.X25519KeyGenerator
-import info.nightscout.androidaps.extensions.toHex
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.mockito.ArgumentMatchers.anyInt
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/EapMessageTest.kt
@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session

-import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
 import org.junit.Assert
 import org.junit.Test
 import org.spongycastle.util.encoders.Hex
--- a/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
+++ b/omnipod-dash/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/session/MilenageTest.kt
@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.comm.session

-import info.nightscout.androidaps.logging.AAPSLoggerTest
 import info.nightscout.androidaps.extensions.toHex
+import info.nightscout.androidaps.logging.AAPSLoggerTest
 import org.junit.Assert
 import org.junit.Test
 import org.spongycastle.util.encoders.Hex