backend/bitbox02bootloader: remove old-school statusChanged event

Author: benma

backend/devices/bitbox02bootloader/device.go

@@ -42,17 +42,13 @@ type Device struct {
 	bootloader.Device
 	deviceID string
 
-	mu      sync.RWMutex
-	onEvent func(event.Event, interface{})
+	mu sync.RWMutex
 
 	log *logrus.Entry
 
 	observable.Implementation
 }
 
-// EventStatusChanged is fired when the status changes. Check the status using Status().
-const EventStatusChanged event.Event = "statusChanged"
-
 // NewDevice creates a new instance of Device.
 func NewDevice(
 	deviceID string,
@@ -134,26 +130,14 @@ func (device *Device) Keystore() keystoreInterface.Keystore {
 
 // SetOnEvent implements device.Device.
 func (device *Device) SetOnEvent(onEvent func(event.Event, interface{})) {
-	device.mu.Lock()
-	defer device.mu.Unlock()
-	device.onEvent = onEvent
 }
 
 func (device *Device) fireEvent() {
-	device.mu.RLock()
-	f := device.onEvent
-	device.mu.RUnlock()
-	if f != nil {
-		// Old-school
-		f(EventStatusChanged, nil)
-
-		// New-school
-		device.Notify(observable.Event{
-			Subject: fmt.Sprintf("status"),
-			Action:  action.Replace,
-			Object:  device.Status(),
-		})
-	}
+	device.Notify(observable.Event{
+		Subject: fmt.Sprintf("status"),
+		Action:  action.Replace,
+		Object:  device.Status(),
+	})
 }
 
 // firmwareBootRequired returns true if the currently flashed firmware has to be booted/run before
@@ -269,7 +253,7 @@ func (device *Device) VersionInfo() (*VersionInfo, error) {
 	brokenInstall := latestFirmwareVersion == currentFirmwareVersion &&
 		!bytes.Equal(currentFirmwareHash, latestFirmwareHash)
 
-	canUpgrade := erased || latestFirmwareVersion > currentFirmwareVersion || brokenInstall || true
+	canUpgrade := erased || latestFirmwareVersion > currentFirmwareVersion || brokenInstall
 	additionalUpgradeFollows := nextFw.monotonicVersion < latestFirmwareVersion
 	device.log.
 		WithField("latestFirmwareVersion", latestFirmwareVersion).