Add message name to sbp2json output [DEVINFRA-1019]

rust/sbp/src/json/mod.rs

@@ -72,6 +72,7 @@ struct CommonJson<'a> {
     crc: u16,
     length: u8,
     msg_type: u16,
+    msg_name: &'a str,
     payload: &'a str,
     preamble: u8,
     sender: u16,

rust/sbp/src/json/ser.rs

@@ -234,6 +234,7 @@ fn get_common_fields<'a, M: SbpMessage>(
     Ok(CommonJson {
         preamble: PREAMBLE,
         sender: msg.sender_id().unwrap_or(0),
+        msg_name: msg.message_name(),
         msg_type: msg.message_type(),
         length: size as u8,
         payload: payload_buf,

rust/sbp2json/tests/test_round_trips.rs

@@ -33,15 +33,11 @@ fn test_stop_on_error() {
 fn test_continue_on_error() {
     let root = find_project_root().unwrap();
     let root = root.as_path();
-    let input_path = root.join(format!("test_data/{}", "short.sbp"));
+    let input_path = root.join(format!("test_data/{}", "short.sbp.json"));
 
-    let source = File::open(input_path).unwrap();
-    let mut sink = Cursor::new(vec![]);
+    let mut source = File::open(input_path).unwrap();
 
-    let _ = converters::sbp2json(source, &mut sink, CompactFormatter {}, false, false);
-
-    sink.set_position(0);
-    assert_eq!(sbp::iter_messages(&mut sink).count(), 355);
+    assert_eq!(sbp::iter_messages(&mut source).count(), 355);
 }
 
 #[test]