refactor(grpc): Refactor grpc test

Reworked to make use of the mock exported in the
astarte_message_hub_proto_mock crate.
Removed controversial template macro.

Signed-off-by: Luca Arato <luca.arato@secomind.com>

Author: lucaato

Cargo.lock

@@ -86,6 +86,8 @@ reqwest = { workspace = true, features = ["macos-system-configuration"] }
 
 [dev-dependencies]
 astarte-device-sdk-derive = { workspace = true }
+astarte-message-hub-proto = { workspace = true }
+astarte-message-hub-proto-mock = { workspace = true }
 async-trait = { workspace = true }
 color-eyre = { workspace = true }
 env_logger = { workspace = true }

Cargo.toml

@@ -108,6 +108,9 @@ mod test {
     pub(crate) const E2E_DEVICE_DATASTREAM: &str = include_str!(
         "../e2e-test/interfaces/org.astarte-platform.rust.e2etest.DeviceDatastream.json"
     );
+    pub(crate) const E2E_SERVER_DATASTREAM: &str = include_str!(
+        "../e2e-test/interfaces/org.astarte-platform.rust.e2etest.ServerAggregate.json"
+    );
     pub(crate) const E2E_DEVICE_AGGREGATE: &str = include_str!(
         "../e2e-test/interfaces/org.astarte-platform.rust.e2etest.DeviceAggregate.json"
     );

src/lib.rs

@@ -410,6 +410,9 @@ impl From<DeviceEvent> for astarte_message_hub_proto::AstarteMessage {
     }
 }
 
+// TODO this is incomplete, no way of creating a PropertyIndividual with a set value
+// refactor value to include a property type or find a way of stashing that information
+// somewhere
 impl From<Value> for ProtoPayload {
     fn from(value: Value) -> Self {
         match value {
@@ -446,10 +449,6 @@ pub(crate) mod test {
 
     use super::*;
 
-    pub(crate) fn new_unset() -> ProtoPayload {
-        ProtoPayload::PropertyIndividual(AstartePropertyIndividual { data: None })
-    }
-
     pub(crate) fn new_astarte_message(
         interface_name: String,
         path: String,
@@ -464,6 +463,16 @@ pub(crate) mod test {
         }
     }
 
+    pub(crate) fn new_property(
+        path: String,
+        data: Option<AstarteType>,
+    ) -> astarte_message_hub_proto::Property {
+        astarte_message_hub_proto::Property {
+            path,
+            data: data.map(|s| s.into()),
+        }
+    }
+
     #[test]
     fn proto_astarte_double_into_astarte_device_sdk_type_success() {
         let value = 15.5;