Refactor and add test for api1 binary query

parse/Cargo.toml

@@ -6,12 +6,13 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.18.1" }
+serde_json = "1.0.89"
+tokio = { version = "1.22.0", features = ["fs"] }
 chrono = { version = "0.4.19", features = ["serde"] }
 bytes = "1.0.1"
 byteorder = "1.4.3"
 hex = "0.4.3"
-nom = "6.1.2"
+nom = "7.1.1"
 num-traits = "0.2"
 num-derive = "0.3"
 err = { path = "../err" }

parse/src/channelconfig.rs

@@ -1,14 +1,10 @@
 use err::Error;
 use netpod::timeunits::MS;
-use netpod::{
-    ByteOrder, Channel, ChannelConfigQuery, ChannelConfigResponse, NanoRange, Nanos, Node, ScalarType, Shape,
-};
+use netpod::{ByteOrder, Channel, NanoRange, Nanos, Node, ScalarType, Shape};
+use netpod::{ChannelConfigQuery, ChannelConfigResponse};
 use nom::bytes::complete::take;
 use nom::number::complete::{be_i16, be_i32, be_i64, be_i8, be_u8};
 use nom::Needed;
-//use nom::bytes::complete::{tag, take_while_m_n};
-//use nom::combinator::map_res;
-//use nom::sequence::tuple;
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::ToPrimitive;
 use serde::{Deserialize, Serialize};

parse/src/jsonconf.rs

@@ -0,0 +1,32 @@
+#[test]
+fn test_json_trailing() {
+    use serde::Deserialize;
+    use serde_json::Value as JsonValue;
+    use std::io::Cursor;
+    if serde_json::from_str::<JsonValue>(r#"{}."#).is_ok() {
+        panic!("Should fail because of trailing character");
+    }
+    let cur = Cursor::new(r#"{}..."#);
+    let mut de = serde_json::Deserializer::from_reader(cur);
+    if JsonValue::deserialize(&mut de).is_err() {
+        panic!("Should allow trailing characters")
+    }
+    let cur = Cursor::new(r#"nullA"#);
+    let mut de = serde_json::Deserializer::from_reader(cur);
+    if let Ok(val) = JsonValue::deserialize(&mut de) {
+        if val != serde_json::json!(null) {
+            panic!("Bad parse")
+        }
+    } else {
+        panic!("Should allow trailing characters")
+    }
+    let cur = Cursor::new(r#"  {}AA"#);
+    let mut de = serde_json::Deserializer::from_reader(cur);
+    if let Ok(val) = JsonValue::deserialize(&mut de) {
+        if val != serde_json::json!({}) {
+            panic!("Bad parse")
+        }
+    } else {
+        panic!("Should allow trailing characters")
+    }
+}

parse/src/lib.rs

@@ -1 +1,2 @@
 pub mod channelconfig;
+mod jsonconf;