Improve bytes serde.

gftea · Dec 23, 2023 · b9065a7 · b9065a7
1 parent de21bbe
commit b9065a7
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 101 deletions.
diff --git a/.github/workflows/regression_test.yml b/.github/workflows/regression_test.yml
@@ -13,7 +13,7 @@ on:
       - 'prepare_release.sh'
       - 'regression_test.sh'
   workflow_dispatch:
-    branches: ["main"]
+
   pull_request:
     branches: ["main"]
     paths-ignore:

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
@@ -13,7 +13,7 @@ on:
       - 'prepare_release.sh'
       - 'regression_test.sh'
   workflow_dispatch:
-    branches: ["main"]
+
   pull_request:
     branches: ["main"]
     paths-ignore:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,3 +9,7 @@ resolver = "2"
 # debug = false
 # lto = true
 # codegen-units = 1
+
+
+[workspace.dependencies]
+serde_bytes_ng = { version = "0.1.1" }
diff --git a/amqp_serde/Cargo.toml b/amqp_serde/Cargo.toml
@@ -14,5 +14,6 @@ documentation = "https://docs.rs/amqp_serde/latest/amqp_serde/"
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 bytes = { version = "1.0" }
+serde_bytes_ng = { workspace = true }
 
 [dev-dependencies]
diff --git a/amqp_serde/src/de.rs b/amqp_serde/src/de.rs
@@ -737,7 +737,7 @@ mod tests {
     fn test_eof() {
         #[derive(Deserialize)]
         struct Frame(u32);
-        let input = vec![0x00];
+        let input = [0x00];
         let _: Frame = from_bytes(&input[..]).unwrap();
     }
 
@@ -746,7 +746,7 @@ mod tests {
     fn test_missing_length() {
         #[derive(Deserialize)]
         struct Frame(Vec<u8>);
-        let input = vec![0, 1, 2];
+        let input = [0, 1, 2];
         let _: Frame = from_bytes(&input[..]).unwrap();
     }
 
@@ -755,7 +755,7 @@ mod tests {
     fn test_syntax_err() {
         #[derive(Deserialize)]
         struct Frame(u8, Vec<u8>);
-        let input = vec![9, 0, 0];
+        let input = [9, 0, 0];
         let _: Frame = from_bytes(&input[..]).unwrap();
     }
 

diff --git a/amqp_serde/src/types.rs b/amqp_serde/src/types.rs
@@ -169,7 +169,7 @@ impl fmt::Display for DecimalValue {
 /// AMQP byte array type.
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone)]
-pub struct ByteArray(LongUint, Vec<u8>);
+pub struct ByteArray(LongUint, #[serde(with = "serde_bytes_ng")] Vec<u8>);
 impl TryFrom<Vec<u8>> for ByteArray {
     type Error = TryFromIntError;
 
@@ -492,72 +492,6 @@ impl AsRef<HashMap<FieldName, FieldValue>> for FieldTable {
     }
 }
 
-/////////////////////////////////////////////////////////////////////////////
-// #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
-// pub struct FieldTable(HashMap<FieldName, FieldValue>);
-// impl Default for FieldTable {
-//     fn default() -> Self {
-//         Self(HashMap::new())
-//     }
-// }
-
-// impl Deref for FieldTable {
-//     type Target = HashMap<FieldName, FieldValue>;
-
-//     fn deref(&self) -> &Self::Target {
-//         &self.0
-//     }
-// }
-
-// impl FieldTable {
-//     pub fn new() -> Self {
-//         Self(HashMap::new())
-//     }
-
-//     pub fn insert<V>(&mut self, k: String, v: V)
-//     where
-//         V: Any,
-//     {
-//         let k: FieldName = k.try_into().unwrap();
-//         let v = &v as &dyn Any;
-
-//         if v.is::<bool>() {
-//             let v = v.downcast_ref::<bool>().unwrap();
-//             let old = self.0.insert(k, FieldValue::t(v.clone()));
-//         } else if v.is::<i8>() {
-//             let v = v.downcast_ref::<i8>().unwrap();
-//             let old = self.0.insert(k, FieldValue::b(v.clone()));
-//         } else if v.is::<u8>() {
-//             let v = v.downcast_ref::<u8>().unwrap();
-//             let old = self.0.insert(k, FieldValue::B(v.clone()));
-//         } else if v.is::<i16>() {
-//             let v = v.downcast_ref::<bool>().unwrap();
-//             let old = self.0.insert(k, FieldValue::t(v.clone()));
-//         } else if v.is::<u16>() {
-//         } else if v.is::<i32>() {
-//         } else if v.is::<u32>() {
-//         } else if v.is::<i64>() {
-//         } else if v.is::<f32>() {
-//         } else if v.is::<f64>() {
-//         } else if v.is::<DecimalValue>() {
-//         } else if v.is::<String>() {
-//             // RabbitMQ does not have "short string" type in field value,
-//             let v = v.downcast_ref::<String>().unwrap();
-//             let old = self
-//                 .0
-//                 .insert(k, FieldValue::S(v.clone().try_into().unwrap()));
-//         } else if v.is::<FieldArray>() {
-//         } else if v.is::<u64>() { // RabbitMQ do not have "Unsigned 64-bit" field value, so `u64` can be uniquely mapped to TimeStamp
-//         } else if v.is::<Self>() {
-//         } else if v.is::<()>() {
-//         } else if v.is::<ByteArray>() {
-//         } else {
-//             panic!("unsupported value type {:?} ", v);
-//         }
-
-//     }
-// }
-
 /////////////////////////////////////////////////////////////////////////////
 // AMQP domains
 /// Note: it is different from definition in [`RabbitMQ Definition`].

diff --git a/amqprs/Cargo.toml b/amqprs/Cargo.toml
@@ -42,6 +42,7 @@ amqp_serde = { path = "../amqp_serde", version = "0.4" }
 async-trait = "0.1"
 tracing = { version = "0.1", optional = true }
 uriparse = { version = "0.6", optional = true }
+serde_bytes_ng = { workspace = true }
 
 # SSL/TLS dependencies
 tokio-rustls = { version = "0.23", optional = true }

diff --git a/amqprs/src/api/channel/basic.rs b/amqprs/src/api/channel/basic.rs
@@ -970,7 +970,6 @@ mod tests {
             consumer::DefaultConsumer,
         },
         frame::BasicProperties,
-        DELIVERY_MODE_TRANSIENT,
     };
     use tokio::time;
 

diff --git a/amqprs/src/api/channel/confim.rs b/amqprs/src/api/channel/confim.rs
@@ -64,7 +64,7 @@ mod tests {
         channel::BasicPublishArguments,
         connection::{Connection, OpenConnectionArguments},
         test_utils::setup_logging,
-        BasicProperties, DELIVERY_MODE_TRANSIENT,
+        BasicProperties,
     };
 
     use super::ConfirmSelectArguments;

diff --git a/amqprs/src/api/channel/mod.rs b/amqprs/src/api/channel/mod.rs
@@ -424,7 +424,7 @@ mod tests {
 
     #[ignore = "https://github.com/gftea/amqprs/issues/69"]
     #[tokio::test]
-    async fn test_channel_is_not_cloneable() {
+    async fn test_channel_cloneable() {
         // default: `IS_CLONEABLE = false` for all types
         trait NotCloneable {
             const IS_CLONEABLE: bool = false;
@@ -438,8 +438,8 @@ mod tests {
         impl<T: Clone> Wrapper<T> {
             const IS_CLONEABLE: bool = true;
         }
-
-        assert_eq!(false, <Wrapper<Channel>>::IS_CLONEABLE);
+        // Prevent clippy to report assertion on const value.
+        assert_eq!(<Wrapper<Channel>>::IS_CLONEABLE.to_string(), "true");
     }
 
     #[tokio::test]

diff --git a/amqprs/src/api/channel/tx.rs b/amqprs/src/api/channel/tx.rs
@@ -96,7 +96,7 @@ mod tests {
         callbacks::{DefaultChannelCallback, DefaultConnectionCallback},
         channel::BasicPublishArguments,
         connection::{Connection, OpenConnectionArguments},
-        BasicProperties, DELIVERY_MODE_TRANSIENT,
+        BasicProperties,
     };
 
     #[tokio::test]

diff --git a/amqprs/src/api/connection.rs b/amqprs/src/api/connection.rs
@@ -607,13 +607,11 @@ impl Connection {
             FieldValue::S("0.1".try_into().unwrap()),
         );
         let mut client_properties_capabilities = FieldTable::new();
-        client_properties_capabilities.insert(
-            "consumer_cancel_notify".try_into().unwrap(), 
-            true.into()
-        );
+        client_properties_capabilities
+            .insert("consumer_cancel_notify".try_into().unwrap(), true.into());
         client_properties.insert(
             "capabilities".try_into().unwrap(),
-            FieldValue::F(client_properties_capabilities)
+            FieldValue::F(client_properties_capabilities),
         );
 
         // S: `Start` C: `StartOk`
@@ -1301,9 +1299,9 @@ mod tests {
             let conn1 = Connection::open(&args).await.unwrap();
             let conn2 = conn1.clone();
             tokio::spawn(async move {
-                assert_eq!(true, conn2.is_open());
+                assert!(conn2.is_open());
             });
-            assert_eq!(true, conn1.is_open());
+            assert!(conn1.is_open());
         }
         // wait for finished, otherwise runtime exit before all tasks are done
         time::sleep(time::Duration::from_millis(100)).await;
@@ -1348,7 +1346,7 @@ mod tests {
             jh.push(thread::spawn(|| generate_connection_name("testdomain")));
         }
         for h in jh {
-            assert_eq!(true, res.insert(h.join().unwrap()));
+            assert!(res.insert(h.join().unwrap()));
         }
     }
 

diff --git a/amqprs/src/frame/content_body.rs b/amqprs/src/frame/content_body.rs
@@ -4,6 +4,7 @@ use super::Frame;
 
 #[derive(Debug, Serialize)]
 pub struct ContentBody {
+    #[serde(with = "serde_bytes_ng")]
     pub(crate) inner: Vec<u8>,
 }