V0.7.0 Arroyo Toad

Fixed support integrating MessageUtils Library

Tests/IoT-Simulator-CoreTests/Devices-Tests.swift

@@ -2,6 +2,7 @@ import Testing
 import RandomCpp
 import Foundation
 import Crypto
+import MessageUtils
 
 @testable import IoT_Simulator_Core
 
@@ -82,13 +83,13 @@ import Crypto
 
     let signKeyPath = "./Private/privateKey.pem"
 
-    let privateKey = try pem2key(filePath: signKeyPath)
+    let privateKey = try pem2_P256key(filePath: signKeyPath)
 
     let dev: EdgeDevice = EdgeDevice(
-        deviceID: "EDG-001", 
+        deviceID: 1, 
         dataType: .Temperature, 
         disconnected: false, 
-        location: Location3D(20, 10, 0), 
+        location: Location(x: 20, y: 10, z: 0), 
         dutyCicle: 100098, 
         sensors: [
             0: Sensor(id: 0, sensorType: DataType.Temperature),
@@ -98,22 +99,19 @@ import Crypto
         privateKey: privateKey
     )
 
-    let message = dev.work(envrionment: env)
-    message.signMessage(key: dev.privateKey)
+    let message = try dev.work(envrionment: env)
 
+    let signedMessage = try deserializeV1(serializedData: message)
 
-    #expect(message != nil, "If this is nil, I don't knwo what's going on")
-    #expect(message.signature != nil, "If signature is nil, something is wrong")
+    print(signedMessage.toString())
+    print(signedMessage.signature)
+
+    #expect(signedMessage != nil, "If this is nil, I don't knwo what's going on")
+    #expect(signedMessage.signature != nil, "If signature is nil, something is wrong")
 
-    print(message.description)
-    print(message.signature)
 
     #expect(
-        try verifySignature(
-            signature:message.signature,
-            string: message.toDataCompatibleString(),
-            key: dev.privateKey.publicKey
-        ), 
+        try verifyMessageSignature(message: signedMessage, key: privateKey.publicKey) ,
         "Let's see that signatures match"
     )
 }
@@ -127,13 +125,13 @@ import Crypto
 
     let signKeyPath = "./Private/privateKey.pem"
 
-    let privateKey = try pem2key(filePath: signKeyPath)
+    let privateKey = try pem2_P256key(filePath: signKeyPath)
 
     let dev: EdgeDevice = EdgeDevice(
-        deviceID: "EDG-001", 
+        deviceID: 1, 
         dataType: .Temperature, 
         disconnected: false, 
-        location: Location3D(20, 10, 0), 
+        location: Location(x: 20, y: 10, z: 0), 
         dutyCicle: 100098, 
         sensors: [
             0: RealSensor(sensorID: 0, sensorType: .Temperature, faulty: false, meanNoise: 1, stdNoise: 3, quantizationBits: 3),
@@ -143,22 +141,19 @@ import Crypto
         privateKey: privateKey
     )
 
-    let message = dev.work(envrionment: env)
-    message.signMessage(key: dev.privateKey)
+    let message = try dev.work(envrionment: env)
 
+    let signedMessage = try deserializeV1(serializedData: message)
 
-    #expect(message != nil, "If this is nil, I don't knwo what's going on")
-    #expect(message.signature != nil, "If signature is nil, something is wrong")
+    print(signedMessage.toString())
+    print(signedMessage.signature)
+
+    #expect(signedMessage != nil, "If this is nil, I don't knwo what's going on")
+    #expect(signedMessage.signature != nil, "If signature is nil, something is wrong")
 
-    print(message.description)
-    print(message.signature)
 
     #expect(
-        try verifySignature(
-            signature:message.signature,
-            string: message.toDataCompatibleString(),
-            key: dev.privateKey.publicKey
-        ), 
+        try verifyMessageSignature(message: signedMessage, key: privateKey.publicKey) ,
         "Let's see that signatures match"
     )
 }

Tests/IoT-Simulator-CoreTests/IoTCore-Tests.swift

@@ -1,6 +1,7 @@
 import DataAcquisition
 import Foundation
 import Testing
+import MessageUtils
 
 @testable import IoT_Simulator_Core
 
@@ -15,13 +16,13 @@ import Testing
 
     let signKeyPath = "./Private/privateKey.pem"
 
-    let privateKey = try pem2key(filePath: signKeyPath)
+    let privateKey = try pem2_P256key(filePath: signKeyPath)
 
     let dev: EdgeDevice = EdgeDevice(
-        deviceID: "EDG-001",
+        deviceID: 1,
         dataType: .Temperature,
         disconnected: false,
-        location: Location3D(20, 10, 0),
+        location: Location(x: 20, y: 10, z: 0),
         dutyCicle: 3000,
         sensors: [
             0: RealSensor(
@@ -38,10 +39,10 @@ import Testing
     )
 
     let dev2: EdgeDevice = EdgeDevice(
-        deviceID: "EDG-002",
+        deviceID: 2,
         dataType: .Temperature,
         disconnected: false,
-        location: Location3D(20, 10, 0),
+        location: Location(x: 20, y: 10, z: 0),
         dutyCicle: 1000,
         sensors: [
             0: RealSensor(
@@ -66,7 +67,7 @@ import Testing
 
 @Test func stressLoop1() async throws {
 
-    let devices: Int = 1000
+    let devices: UInt128 = 600
 
     let env = PhysicalEnvironment("Delta")
     let truth = PhysicalData(.Temperature, 22)
@@ -77,15 +78,15 @@ import Testing
 
     let signKeyPath = "./Private/privateKey.pem"
 
-    let privateKey = try pem2key(filePath: signKeyPath)
+    let privateKey = try pem2_P256key(filePath: signKeyPath)
 
-    for i in 0..<devices {
+    for i: UInt128 in 0..<devices {
 
         let dev: EdgeDevice = EdgeDevice(
-            deviceID: "EDG-00\(i)",
+            deviceID: i,
             dataType: .Temperature,
             disconnected: false,
-            location: Location3D(20, 10, 0),
+            location: Location(x: 20, y: 10, z: 0),
             dutyCicle: 200 + UInt.random(in: 1000...5000),
             sensors: [
                 0: RealSensor(