Use macaddr rather than eui48 and bump dependencies

Cargo.toml

@@ -28,7 +28,7 @@ bytes = "1.0"
 chacha20poly1305 = "0.8"
 ed25519-dalek = { version = "1.0", features = ["std", "serde"] }
 erased-serde = "0.3"
-eui48 = { version = "1.0", features = ["serde"] }
+macaddr = { version = "1.0.1", features = ["serde"] }
 futures = "0.3"
 get_if_addrs = "0.5"
 hkdf = "0.11"

codegen/src/main.rs

@@ -1274,7 +1274,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: \"Acme {{service.DefaultDescription}}\".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: {{category service.DefaultDescription}},
                 ..Default::default()
             };

examples/adding_accessories_dynamically.rs

@@ -33,7 +33,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Bridge".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Bridge,
                 ..Default::default()
             };

examples/air_purifier.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{air_purifier::AirPurifierAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, air_purifier::AirPurifierAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Air Purifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirPurifier,
                 ..Default::default()
             };

examples/air_quality_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{air_quality_sensor::AirQualitySensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, air_quality_sensor::AirQualitySensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Air Quality Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/async_callbacks.rs

@@ -49,7 +49,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/bridged_accessories.rs

@@ -73,7 +73,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Bridge".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Bridge,
                 ..Default::default()
             };

examples/callbacks.rs

@@ -42,7 +42,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/carbon_dioxide_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{carbon_dioxide_sensor::CarbonDioxideSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, carbon_dioxide_sensor::CarbonDioxideSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Carbon dioxide Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/carbon_monoxide_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{carbon_monoxide_sensor::CarbonMonoxideSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, carbon_monoxide_sensor::CarbonMonoxideSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Carbon monoxide Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/contact_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{contact_sensor::ContactSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, contact_sensor::ContactSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Contact Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/cooler.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Cooler".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirConditioner,
                 ..Default::default()
             };

examples/custom_characteristics_services_accessories.rs

@@ -240,7 +240,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Foo".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Other,
                 ..Default::default()
             };

examples/custom_multi_sensor.rs

@@ -111,7 +111,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Temperature & Humidity Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/dehumidifier.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Dehumidifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirDehumidifier,
                 ..Default::default()
             };

examples/door.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{door::DoorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, door::DoorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Door".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Door,
                 ..Default::default()
             };

examples/fan.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{fan::FanAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, fan::FanAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Fan".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Fan,
                 ..Default::default()
             };

examples/fan_v2.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{fan_v2::FanV2Accessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, fan_v2::FanV2Accessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Fan v2".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Fan,
                 ..Default::default()
             };

examples/faucet.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Faucet".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Faucet,
                 ..Default::default()
             };

examples/garage_door_opener.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{garage_door_opener::GarageDoorOpenerAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, garage_door_opener::GarageDoorOpenerAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Garage Door Opener".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::GarageDoorOpener,
                 ..Default::default()
             };

examples/heater.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Heater".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirHeater,
                 ..Default::default()
             };

examples/humidifier.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Humidifier-Dehumidifier".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::AirDehumidifier,
                 ..Default::default()
             };

examples/humidity_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{humidity_sensor::HumiditySensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, humidity_sensor::HumiditySensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Humidity Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/irrigation_system.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Irrigation-System".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sprinkler,
                 ..Default::default()
             };

examples/leak_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{leak_sensor::LeakSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, leak_sensor::LeakSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Leak Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/light_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{light_sensor::LightSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, light_sensor::LightSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Light Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/lightbulb.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lightbulb".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Lightbulb,
                 ..Default::default()
             };

examples/lock.rs

@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Lock".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::DoorLock,
                 ..Default::default()
             };

examples/motion_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{motion_sensor::MotionSensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, motion_sensor::MotionSensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Motion Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };

examples/occupancy_sensor.rs

@@ -1,7 +1,7 @@
 use tokio;
 
 use hap::{
-    accessory::{occupancy_sensor::OccupancySensorAccessory, AccessoryCategory, AccessoryInformation},
+    accessory::{AccessoryCategory, AccessoryInformation, occupancy_sensor::OccupancySensorAccessory},
     server::{IpServer, Server},
     storage::{FileStorage, Storage},
     Config,
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
             let config = Config {
                 pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3])?,
                 name: "Acme Occupancy Sensor".into(),
-                device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
+                device_id: MacAddress::from([10, 20, 30, 40, 50, 60]),
                 category: AccessoryCategory::Sensor,
                 ..Default::default()
             };