rust: bump serde_bytes to 0.11.5

oasisprotocol · Sep 21, 2020 · f998703 · f998703
1 parent 7d8fe1c
commit f998703
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 oasis-core-runtime = { path = "../runtime" }
 serde = { version = "1.0.116", features = ["derive"] }
-serde_bytes = "~0.10"
+serde_bytes = "0.11.5"
 serde_cbor = "0.11.1"
 anyhow = "1.0"
 thiserror = "1.0"

diff --git a/client/src/enclave_rpc/transport.rs b/client/src/enclave_rpc/transport.rs
@@ -85,7 +85,7 @@ impl Transport for GrpcTransport {
         };
 
         match self.grpc_client.call_enclave(&req, Default::default()) {
-            Ok(rsp) => Box::new(rsp.map(|r| r.into()).map_err(|error| error.into())),
+            Ok(rsp) => Box::new(rsp.map(|r| r.into_vec()).map_err(|error| error.into())),
             Err(error) => Box::new(future::err(error.into())),
         }
     }

diff --git a/client/src/transaction/client.rs b/client/src/transaction/client.rs
@@ -93,7 +93,7 @@ impl TxnClient {
             Ok(resp) => Box::new(
                 resp.map(|r| {
                     drop(span);
-                    r.into()
+                    r.into_vec()
                 })
                 .map_err(|error| TxnClientError::CallFailed(format!("{}", error)).into()),
             ),

diff --git a/keymanager-api-common/Cargo.toml b/keymanager-api-common/Cargo.toml
@@ -9,7 +9,7 @@ oasis-core-runtime = { path = "../runtime" }
 
 base64 = "0.12.3"
 serde = { version = "1.0.116", features = ["derive"] }
-serde_bytes = "~0.10"
+serde_bytes = "0.11.5"
 rustc-hex = "2.0.1"
 anyhow = "1.0"
 thiserror = "1.0"

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -13,7 +13,7 @@ slog-stdlog = "4.0.0"
 serde = { version = "1.0.116", features = ["derive"] }
 serde_cbor = "0.11.1"
 serde_json = "1.0.39"
-serde_bytes = "~0.10"
+serde_bytes = "0.11.5"
 serde_repr = "0.1.5"
 lazy_static = "1.3.0"
 crossbeam = "0.7.1"

diff --git a/runtime/src/enclave_rpc/demux.rs b/runtime/src/enclave_rpc/demux.rs
@@ -96,7 +96,7 @@ impl Demux {
         let id = frame.session.clone();
         let untrusted_plaintext = frame.untrusted_plaintext.clone();
 
-        if let Some(enriched_session) = self.sessions.get_mut(&id) {
+        if let Some(enriched_session) = self.sessions.get_mut(&id.into()) {
             match enriched_session
                 .session
                 .process_data(frame.payload, writer)

diff --git a/runtime/src/enclave_rpc/types.rs b/runtime/src/enclave_rpc/types.rs
@@ -25,7 +25,6 @@ impl SessionID {
 /// Frame.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Frame {
-    #[serde(with = "serde_bytes")]
     pub session: SessionID,
     // The `untrusted_plaintext` field is only a temporary workaround until
     // the snow library supports encrypting the payload with authenticated

diff --git a/runtime/src/transaction/types.rs b/runtime/src/transaction/types.rs
@@ -58,7 +58,8 @@ mod batch_serialize {
     where
         D: Deserializer<'de>,
     {
-        Vec::<ByteBuf>::deserialize(deserializer).map(|v| v.into_iter().map(|e| e.into()).collect())
+        Vec::<ByteBuf>::deserialize(deserializer)
+            .map(|v| v.into_iter().map(ByteBuf::into_vec).collect())
     }
 }
 

diff --git a/tests/clients/simple-keyvalue/Cargo.toml b/tests/clients/simple-keyvalue/Cargo.toml
@@ -15,3 +15,4 @@ grpcio = "0.4.6"
 io-context = "0.2.0"
 rand = "0.7.3"
 tokio = "0.1.17"
+serde_bytes = "0.11.5"
diff --git a/tests/clients/simple-keyvalue/src/main.rs b/tests/clients/simple-keyvalue/src/main.rs
@@ -13,6 +13,7 @@ use clap::{App, Arg};
 use grpcio::EnvBuilder;
 use io_context::Context;
 use rand::{rngs::StdRng, Rng, SeedableRng};
+use serde_bytes::ByteBuf;
 use tokio::runtime::Runtime;
 
 use oasis_core_client::{
@@ -229,7 +230,7 @@ fn main() {
         round_max: latest_round,
         conditions: vec![QueryCondition {
             key: b"kv_op".to_vec(),
-            values: vec![b"insert".to_vec().into()],
+            values: vec![ByteBuf::from(b"insert".to_vec())],
         }],
         limit: 0,
     };