Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cosmos-sdk-proto: add serde derive macros #471

Merged
merged 24 commits into from
Aug 13, 2024
Merged

cosmos-sdk-proto: add serde derive macros #471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a2d1abc
add serde definitions
ash-burnt Jun 1, 2024
8bfa16c
add pbjson
ash-burnt Jun 1, 2024
11179f1
add wasmd, update plugins
ash-burnt Jun 1, 2024
17d17d9
extern google types with pbjson-types
ash-burnt Jun 2, 2024
702d384
compiles
ash-burnt Jun 2, 2024
89cc500
patch validators policy for serde
ash-burnt Jun 2, 2024
69dd4c9
different patch for serde
ash-burnt Jun 2, 2024
5ebab1c
add more name definitions for authorizations
ash-burnt Jun 3, 2024
0dde80f
updated with upstream tendermint changes
ash-burnt Aug 8, 2024
9dae930
switch to informal pbjson
ash-burnt Aug 8, 2024
fda84ca
review notes
ash-burnt Aug 8, 2024
b716d6d
Update cosmos-sdk-proto/Cargo.toml
ash-burnt Aug 9, 2024
b7e04cc
remove comment
ash-burnt Aug 9, 2024
f9e43da
Merge branch 'feat/serde' of github.com-ash:burnt-labs/cosmos-rust in…
ash-burnt Aug 9, 2024
8474c92
cargo changes
ash-burnt Aug 9, 2024
d36b12b
pull upstream
ash-burnt Aug 9, 2024
0960168
formatting
ash-burnt Aug 9, 2024
e8b7d05
cosmwasm authorizations don't exist in this version
ash-burnt Aug 9, 2024
304bc5d
bring in pbjson for serialization
ash-burnt Aug 9, 2024
395d8d7
Update cosmos-sdk-proto/Cargo.toml
ash-burnt Aug 9, 2024
39988e6
Update cosmos-sdk-proto/Cargo.toml
ash-burnt Aug 9, 2024
608a337
move serialization into a feature tag
ash-burnt Aug 9, 2024
368b109
change name to serde
ash-burnt Aug 11, 2024
41b9a21
format
ash-burnt Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move serialization into a feature tag
  • Loading branch information
@ash-burnt
ash-burnt committed Aug 9, 2024
commit 608a33754691f1d2ff5dc4fd50d3403fae62b9af
5 changes: 3 additions & 2 deletions cosmos-sdk-proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ rust-version = "1.72"
[dependencies]
prost = { version = "0.13", default-features = false }
tendermint-proto = "0.39.1"
serde = "1.0.203"
pbjson = { package = "informalsystems-pbjson", version = "0.7" }

# Optional dependencies
tonic = { version = "0.12", optional = true, default-features = false, features = ["codegen", "prost"] }
serde = { version = "1.0.203", optional = true, default-features = false, features = ["alloc"] }
pbjson = { package = "informalsystems-pbjson", optional = true, version = "0.7" }

[features]
default = ["grpc-transport"]
std = ["prost/std", "tendermint-proto/std"]
grpc = ["std", "tonic"]
grpc-transport = ["grpc", "tonic/transport"]
cosmwasm = []
serialization = ["serde", "tendermint-proto/std", "pbjson"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a lot of serialization going on in this crate, both protobuf and now JSON.

How about:

Suggested change
serialization = ["serde", "tendermint-proto/std", "pbjson"]
serde = ["dep:serde", "tendermint-proto/std", "pbjson"]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, and adjusted the code gen


[package.metadata.docs.rs]
all-features = true
Expand Down
3 changes: 3 additions & 0 deletions cosmos-sdk-proto/src/prost/cosmos-sdk/cosmos.app.module.v1alpha1.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// @generated
#[cfg(feature = "serialization")]
impl serde::Serialize for Module {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -11,6 +12,7 @@ impl serde::Serialize for Module {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for Module {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -21,6 +23,7 @@ impl<'de> serde::Deserialize<'de> for Module {

#[allow(clippy::enum_variant_names)]
enum GeneratedField {}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down
21 changes: 21 additions & 0 deletions cosmos-sdk-proto/src/prost/cosmos-sdk/cosmos.app.v1alpha1.serde.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// @generated
#[cfg(feature = "serialization")]
impl serde::Serialize for Config {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -17,6 +18,7 @@ impl serde::Serialize for Config {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for Config {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -29,6 +31,7 @@ impl<'de> serde::Deserialize<'de> for Config {
enum GeneratedField {
Modules,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -91,6 +94,7 @@ impl<'de> serde::Deserialize<'de> for Config {
deserializer.deserialize_struct("cosmos.app.v1alpha1.Config", FIELDS, GeneratedVisitor)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for MigrateFromInfo {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -110,6 +114,7 @@ impl serde::Serialize for MigrateFromInfo {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for MigrateFromInfo {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -122,6 +127,7 @@ impl<'de> serde::Deserialize<'de> for MigrateFromInfo {
enum GeneratedField {
Module,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -188,6 +194,7 @@ impl<'de> serde::Deserialize<'de> for MigrateFromInfo {
)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for ModuleConfig {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -213,6 +220,7 @@ impl serde::Serialize for ModuleConfig {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for ModuleConfig {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -226,6 +234,7 @@ impl<'de> serde::Deserialize<'de> for ModuleConfig {
Name,
Config,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -301,6 +310,7 @@ impl<'de> serde::Deserialize<'de> for ModuleConfig {
)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for ModuleDescriptor {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand Down Expand Up @@ -332,6 +342,7 @@ impl serde::Serialize for ModuleDescriptor {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for ModuleDescriptor {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -353,6 +364,7 @@ impl<'de> serde::Deserialize<'de> for ModuleDescriptor {
UsePackage,
CanMigrateFrom,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -439,6 +451,7 @@ impl<'de> serde::Deserialize<'de> for ModuleDescriptor {
)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for PackageReference {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -464,6 +477,7 @@ impl serde::Serialize for PackageReference {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for PackageReference {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -477,6 +491,7 @@ impl<'de> serde::Deserialize<'de> for PackageReference {
Name,
Revision,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -555,6 +570,7 @@ impl<'de> serde::Deserialize<'de> for PackageReference {
)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for QueryConfigRequest {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -568,6 +584,7 @@ impl serde::Serialize for QueryConfigRequest {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for QueryConfigRequest {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -578,6 +595,7 @@ impl<'de> serde::Deserialize<'de> for QueryConfigRequest {

#[allow(clippy::enum_variant_names)]
enum GeneratedField {}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down Expand Up @@ -631,6 +649,7 @@ impl<'de> serde::Deserialize<'de> for QueryConfigRequest {
)
}
}
#[cfg(feature = "serialization")]
impl serde::Serialize for QueryConfigResponse {
#[allow(deprecated)]
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
Expand All @@ -650,6 +669,7 @@ impl serde::Serialize for QueryConfigResponse {
struct_ser.end()
}
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for QueryConfigResponse {
#[allow(deprecated)]
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
Expand All @@ -662,6 +682,7 @@ impl<'de> serde::Deserialize<'de> for QueryConfigResponse {
enum GeneratedField {
Config,
}
#[cfg(feature = "serialization")]
impl<'de> serde::Deserialize<'de> for GeneratedField {
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
where
Expand Down
Loading