diff --git a/Cargo.toml b/Cargo.toml index be9eff233..183496587 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,5 +73,3 @@ quote = "1.0" syn = { version = "1.0.105", features=["full", "extra-traits", "visit"] } base64 = "0.13.1" bigdecimal = "0.3.0" -num-bigint = "0.4.3" -serde_bytes = "0.11.5" diff --git a/packages/client/Cargo.toml b/packages/client/Cargo.toml index f24b5b455..695c03c63 100644 --- a/packages/client/Cargo.toml +++ b/packages/client/Cargo.toml @@ -18,10 +18,7 @@ wrap_manifest_schemas.workspace = true thiserror.workspace = true serde.workspace = true -serde_json.workspace = true -serde_bytes.workspace = true [dev-dependencies] polywrap_tests_utils.workspace = true -bigdecimal.workspace = true -num-bigint.workspace = true \ No newline at end of file +bigdecimal.workspace = true \ No newline at end of file diff --git a/packages/client/tests/it/wrap_types/bytes.rs b/packages/client/tests/it/wrap_types/bytes.rs index b0571aa89..013730b68 100644 --- a/packages/client/tests/it/wrap_types/bytes.rs +++ b/packages/client/tests/it/wrap_types/bytes.rs @@ -1,7 +1,7 @@ use polywrap_msgpack_serde::to_vec; use polywrap_tests_utils::helpers::get_tests_path; use serde::{Deserialize, Serialize}; -use serde_bytes::ByteBuf; +use polywrap_msgpack_serde::bytes; use crate::wrap_types::get_client; @@ -12,7 +12,7 @@ struct BytesMethodArgs { #[derive(Serialize, Deserialize)] struct Args { - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] prop: Vec, } @@ -31,7 +31,7 @@ fn bytes_method() { }, }; let response = client - .invoke::( + .invoke::( &uri, "bytesMethod", Some(&to_vec(&args).unwrap()), diff --git a/packages/client/tests/it/wrap_types/object.rs b/packages/client/tests/it/wrap_types/object.rs index 88f05498d..2de425d84 100644 --- a/packages/client/tests/it/wrap_types/object.rs +++ b/packages/client/tests/it/wrap_types/object.rs @@ -1,6 +1,6 @@ use polywrap_client::client::PolywrapClient; use polywrap_client::core::uri::Uri; -use polywrap_msgpack_serde::to_vec; +use polywrap_msgpack_serde::{to_vec, bytes}; use polywrap_tests_utils::helpers::get_tests_path; use serde::{Deserialize, Serialize}; @@ -34,7 +34,7 @@ struct Arg2 { #[derive(Serialize)] struct Arg3 { - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] prop: Vec, } diff --git a/packages/core/Cargo.toml b/packages/core/Cargo.toml index 84bfdbaa1..e6dff10cf 100644 --- a/packages/core/Cargo.toml +++ b/packages/core/Cargo.toml @@ -14,7 +14,6 @@ wrap_manifest_schemas.workspace = true polywrap_msgpack_serde.workspace = true serde.workspace = true jsonschema.workspace = true -serde_bytes.workspace = true polywrap_uri.workspace = true polywrap_core_macros = { workspace = true, optional = true } diff --git a/packages/core/src/resolution/helpers.rs b/packages/core/src/resolution/helpers.rs index f5e752648..8444a247b 100644 --- a/packages/core/src/resolution/helpers.rs +++ b/packages/core/src/resolution/helpers.rs @@ -4,9 +4,8 @@ use crate::{ client::Client, error::Error, file_reader::FileReader, interface_implementation::InterfaceImplementations, invoker::Invoker, uri::Uri, }; -use polywrap_msgpack_serde::to_vec; +use polywrap_msgpack_serde::{to_vec, bytes}; use serde::Serialize; -use serde_bytes::ByteBuf; fn combine_paths(a: &str, b: &str) -> String { let mut a = a.to_string(); @@ -63,7 +62,7 @@ impl FileReader for UriResolverExtensionFileReader { None, )?; - let result: ByteBuf = polywrap_msgpack_serde::from_slice(&result)?; + let result: bytes::ByteBuf = polywrap_msgpack_serde::from_slice(&result)?; Ok(result.into_vec()) } } diff --git a/packages/plugin/Cargo.toml b/packages/plugin/Cargo.toml index 7967f3014..aaf223a4b 100644 --- a/packages/plugin/Cargo.toml +++ b/packages/plugin/Cargo.toml @@ -20,7 +20,6 @@ polywrap_plugin_implementor = { workspace = true, optional = true } serde.workspace = true bigdecimal.workspace = true -num-bigint.workspace = true [features] default = ["implementor"] diff --git a/packages/plugin/src/lib.rs b/packages/plugin/src/lib.rs index c92bba038..0a01bc351 100644 --- a/packages/plugin/src/lib.rs +++ b/packages/plugin/src/lib.rs @@ -8,6 +8,5 @@ pub mod wrapper; pub use polywrap_plugin_implementor as implementor; pub use bigdecimal::BigDecimal as BigNumber; -pub use num_bigint::BigInt; pub use polywrap_msgpack_serde::Map; pub use serde_json as JSON; diff --git a/packages/plugins/fs/Cargo.toml b/packages/plugins/fs/Cargo.toml index abc15b536..fe0579e4c 100644 --- a/packages/plugins/fs/Cargo.toml +++ b/packages/plugins/fs/Cargo.toml @@ -16,7 +16,6 @@ wrap_manifest_schemas.workspace = true serde.workspace = true rm_rf = "0.6.2" -serde_bytes.workspace = true thiserror.workspace = true [dev-dependencies] diff --git a/packages/plugins/fs/src/lib.rs b/packages/plugins/fs/src/lib.rs index b63ea5287..44aecbd46 100644 --- a/packages/plugins/fs/src/lib.rs +++ b/packages/plugins/fs/src/lib.rs @@ -8,7 +8,7 @@ use wrap::module::{ Module, }; pub mod wrap; -use serde_bytes::ByteBuf; +use polywrap_msgpack_serde::bytes; #[derive(Debug)] pub struct FileSystemPlugin; diff --git a/packages/plugins/fs/src/wrap/module.rs b/packages/plugins/fs/src/wrap/module.rs index 70b32c578..b71e478d8 100644 --- a/packages/plugins/fs/src/wrap/module.rs +++ b/packages/plugins/fs/src/wrap/module.rs @@ -5,7 +5,6 @@ use std::sync::Arc; use polywrap_core::invoker::Invoker; use polywrap_plugin::{error::PluginError, module::PluginModule}; use serde::{Serialize, Deserialize}; -use serde_bytes::ByteBuf; use super::types::*; #[derive(Clone, Debug, Deserialize, Serialize)] @@ -27,7 +26,7 @@ pub struct ArgsExists { #[derive(Clone, Debug, Deserialize, Serialize)] pub struct ArgsWriteFile { pub path: String, - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] pub data: Vec, } @@ -50,7 +49,7 @@ pub struct ArgsRmdir { } pub trait Module: PluginModule { - fn read_file(&mut self, args: &ArgsReadFile, invoker: Arc) -> Result; + fn read_file(&mut self, args: &ArgsReadFile, invoker: Arc) -> Result; fn read_file_as_string(&mut self, args: &ArgsReadFileAsString, invoker: Arc) -> Result; diff --git a/packages/plugins/fs/tests/it/main.rs b/packages/plugins/fs/tests/it/main.rs index 9be85953f..30b41c0e7 100644 --- a/packages/plugins/fs/tests/it/main.rs +++ b/packages/plugins/fs/tests/it/main.rs @@ -6,7 +6,8 @@ use polywrap_resolvers::static_resolver::{StaticResolver, StaticResolverLike}; use polywrap_plugin::package::PluginPackage; use serde::Serialize; -use serde_bytes::ByteBuf; +use polywrap_msgpack_serde::bytes; +use polywrap_msgpack_serde::bytes::ByteBuf; use std::path::Path; use std::sync::Arc; use std::{env, fs}; @@ -206,7 +207,7 @@ fn should_return_whether_a_file_exists_or_not() { #[derive(Serialize)] struct WriteFileArgs { path: String, - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] data: Vec, } diff --git a/packages/resolver-extensions/Cargo.toml b/packages/resolver-extensions/Cargo.toml index 2233f475f..625485eae 100644 --- a/packages/resolver-extensions/Cargo.toml +++ b/packages/resolver-extensions/Cargo.toml @@ -15,7 +15,6 @@ polywrap_wasm.workspace = true polywrap_msgpack_serde.workspace = true polywrap_resolvers.workspace = true serde.workspace = true -serde_bytes.workspace = true [dev-dependencies] polywrap_tests_utils.workspace = true diff --git a/packages/resolver-extensions/src/uri_resolver_wrapper.rs b/packages/resolver-extensions/src/uri_resolver_wrapper.rs index ed9034cd6..1312a68b6 100644 --- a/packages/resolver-extensions/src/uri_resolver_wrapper.rs +++ b/packages/resolver-extensions/src/uri_resolver_wrapper.rs @@ -14,6 +14,7 @@ use polywrap_core::{ use polywrap_msgpack_serde::{from_slice, to_vec}; use polywrap_wasm::wasm_package::WasmPackage; use serde::{Deserialize, Serialize}; +use polywrap_msgpack_serde::bytes; pub struct UriResolverWrapper { pub implementation_uri: Uri, @@ -22,7 +23,7 @@ pub struct UriResolverWrapper { #[derive(Clone, Debug, Deserialize, Serialize)] pub struct MaybeUriOrManifest { pub uri: Option, - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] pub manifest: Option>, } diff --git a/packages/resolvers/Cargo.toml b/packages/resolvers/Cargo.toml index 179d3f90d..cf9de5159 100644 --- a/packages/resolvers/Cargo.toml +++ b/packages/resolvers/Cargo.toml @@ -14,5 +14,4 @@ polywrap_core.workspace = true polywrap_wasm.workspace = true polywrap_msgpack_serde.workspace = true serde.workspace = true -serde_bytes.workspace = true diff --git a/packages/tests-utils/Cargo.toml b/packages/tests-utils/Cargo.toml index 1fe1e59af..22c147973 100644 --- a/packages/tests-utils/Cargo.toml +++ b/packages/tests-utils/Cargo.toml @@ -14,10 +14,8 @@ polywrap_core.workspace = true wrap_manifest_schemas.workspace = true thiserror.workspace = true serde.workspace = true -serde_json.workspace = true polywrap_plugin.workspace = true polywrap_msgpack_serde.workspace = true -serde_bytes.workspace = true reqwest = { version = "0.11", features = ["json"] } tokio = { version = "1.23.0", features = ["full"] } diff --git a/packages/tests-utils/src/mocks/invoker.rs b/packages/tests-utils/src/mocks/invoker.rs index c8d241359..161b23cf8 100644 --- a/packages/tests-utils/src/mocks/invoker.rs +++ b/packages/tests-utils/src/mocks/invoker.rs @@ -9,11 +9,12 @@ use polywrap_core::{ }; use polywrap_msgpack_serde::to_vec; use serde::{Deserialize, Serialize}; +use polywrap_msgpack_serde::bytes; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct MaybeUriOrManifest { pub uri: Option, - #[serde(with = "serde_bytes")] + #[serde(with = "bytes")] pub manifest: Option>, }