Skip to content

Commit 75c91e3

Browse files
chalabi2chalabi2
committed
fix(aep-86): sync generated SDK outputs
Regenerate the TypeScript and Rust SDK bindings for the AEP-86 proto surface. Keep the AEP-local lint fixes from the generated checks. Signed-off-by: Joseph Chalabi <chalabi.joseph@gmail.com>
1 parent 459fe35 commit 75c91e3

48 files changed

Lines changed: 60861 additions & 2327 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go/node/verification/v1/tier_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestMinBondForTier(t *testing.T) {
141141
for _, tc := range cases {
142142
t.Run(tc.name, func(t *testing.T) {
143143
got := MinBondForTier(p, tc.tier)
144-
if !got.IsEqual(tc.want) {
144+
if !got.Equal(tc.want) {
145145
t.Errorf("MinBondForTier(%v) = %v; want %v", tc.tier, got, tc.want)
146146
}
147147
})

‎go/sdl/verification.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type v2Verification struct {
2121
// Valid values are 0..4 inclusive. A value of 0 (TierUnspecified) combined
2222
// with no other filtering fields collapses the entire block to nil in
2323
// `toProto()` so the wire form matches an omitted block.
24-
MinTier int `yaml:"min_tier"`
24+
MinTier int32 `yaml:"min_tier"`
2525
// Capabilities is the list of optional provider capability flags the
2626
// tenant requires bidders to assert. The SDL strings are the lowercase
2727
// names defined in `verification/v1.capabilities.go` (e.g.

‎go/sdl/verification_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ min_tier: 0
164164
var v v2Verification
165165
err := yaml.Unmarshal(in, &v)
166166
require.NoError(t, err)
167-
assert.Equal(t, 0, v.MinTier)
167+
assert.Equal(t, int32(0), v.MinTier)
168168
assert.Equal(t, "", v.AuditorMode)
169169
assert.Empty(t, v.Capabilities)
170170
assert.Empty(t, v.Auditors)

‎rs/src/gen/node/akash.base.attributes.v1.rs‎

Lines changed: 213 additions & 176 deletions
Large diffs are not rendered by default.

‎rs/src/gen/node/akash.base.attributes.v1.serde.rs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,19 @@ impl serde::Serialize for PlacementRequirements {
121121
if !self.attributes.is_empty() {
122122
len += 1;
123123
}
124+
if self.verification.is_some() {
125+
len += 1;
126+
}
124127
let mut struct_ser = serializer.serialize_struct("akash.base.attributes.v1.PlacementRequirements", len)?;
125128
if let Some(v) = self.signed_by.as_ref() {
126129
struct_ser.serialize_field("signedBy", v)?;
127130
}
128131
if !self.attributes.is_empty() {
129132
struct_ser.serialize_field("attributes", &self.attributes)?;
130133
}
134+
if let Some(v) = self.verification.as_ref() {
135+
struct_ser.serialize_field("verification", v)?;
136+
}
131137
struct_ser.end()
132138
}
133139
}
@@ -141,12 +147,14 @@ impl<'de> serde::Deserialize<'de> for PlacementRequirements {
141147
"signed_by",
142148
"signedBy",
143149
"attributes",
150+
"verification",
144151
];
145152

146153
#[allow(clippy::enum_variant_names)]
147154
enum GeneratedField {
148155
SignedBy,
149156
Attributes,
157+
Verification,
150158
}
151159
impl<'de> serde::Deserialize<'de> for GeneratedField {
152160
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
@@ -170,6 +178,7 @@ impl<'de> serde::Deserialize<'de> for PlacementRequirements {
170178
match value {
171179
"signedBy" | "signed_by" => Ok(GeneratedField::SignedBy),
172180
"attributes" => Ok(GeneratedField::Attributes),
181+
"verification" => Ok(GeneratedField::Verification),
173182
_ => Err(serde::de::Error::unknown_field(value, FIELDS)),
174183
}
175184
}
@@ -191,6 +200,7 @@ impl<'de> serde::Deserialize<'de> for PlacementRequirements {
191200
{
192201
let mut signed_by__ = None;
193202
let mut attributes__ = None;
203+
let mut verification__ = None;
194204
while let Some(k) = map_.next_key()? {
195205
match k {
196206
GeneratedField::SignedBy => {
@@ -205,11 +215,18 @@ impl<'de> serde::Deserialize<'de> for PlacementRequirements {
205215
}
206216
attributes__ = Some(map_.next_value()?);
207217
}
218+
GeneratedField::Verification => {
219+
if verification__.is_some() {
220+
return Err(serde::de::Error::duplicate_field("verification"));
221+
}
222+
verification__ = map_.next_value()?;
223+
}
208224
}
209225
}
210226
Ok(PlacementRequirements {
211227
signed_by: signed_by__,
212228
attributes: attributes__.unwrap_or_default(),
229+
verification: verification__,
213230
})
214231
}
215232
}

‎rs/src/gen/node/akash.inventory.v1.rs‎

Lines changed: 310 additions & 1 deletion
Large diffs are not rendered by default.

‎rs/src/gen/node/akash.inventory.v1.serde.rs‎

Lines changed: 230 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl<'de> serde::Deserialize<'de> for CpuInfo {
234234
if vcores__.is_some() {
235235
return Err(serde::de::Error::duplicate_field("vcores"));
236236
}
237-
vcores__ =
237+
vcores__ =
238238
Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0)
239239
;
240240
}
@@ -645,6 +645,235 @@ impl<'de> serde::Deserialize<'de> for GpuInfo {
645645
deserializer.deserialize_struct("akash.inventory.v1.GPUInfo", FIELDS, GeneratedVisitor)
646646
}
647647
}
648+
impl serde::Serialize for GetInventorySnapshotRequest {
649+
#[allow(deprecated)]
650+
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
651+
where
652+
S: serde::Serializer,
653+
{
654+
use serde::ser::SerializeStruct;
655+
let mut len = 0;
656+
if !self.nonce.is_empty() {
657+
len += 1;
658+
}
659+
let mut struct_ser = serializer.serialize_struct("akash.inventory.v1.GetInventorySnapshotRequest", len)?;
660+
if !self.nonce.is_empty() {
661+
#[allow(clippy::needless_borrow)]
662+
#[allow(clippy::needless_borrows_for_generic_args)]
663+
struct_ser.serialize_field("nonce", pbjson::private::base64::encode(&self.nonce).as_str())?;
664+
}
665+
struct_ser.end()
666+
}
667+
}
668+
impl<'de> serde::Deserialize<'de> for GetInventorySnapshotRequest {
669+
#[allow(deprecated)]
670+
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
671+
where
672+
D: serde::Deserializer<'de>,
673+
{
674+
const FIELDS: &[&str] = &[
675+
"nonce",
676+
];
677+
678+
#[allow(clippy::enum_variant_names)]
679+
enum GeneratedField {
680+
Nonce,
681+
}
682+
impl<'de> serde::Deserialize<'de> for GeneratedField {
683+
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
684+
where
685+
D: serde::Deserializer<'de>,
686+
{
687+
struct GeneratedVisitor;
688+
689+
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
690+
type Value = GeneratedField;
691+
692+
fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
693+
write!(formatter, "expected one of: {:?}", &FIELDS)
694+
}
695+
696+
#[allow(unused_variables)]
697+
fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
698+
where
699+
E: serde::de::Error,
700+
{
701+
match value {
702+
"nonce" => Ok(GeneratedField::Nonce),
703+
_ => Err(serde::de::Error::unknown_field(value, FIELDS)),
704+
}
705+
}
706+
}
707+
deserializer.deserialize_identifier(GeneratedVisitor)
708+
}
709+
}
710+
struct GeneratedVisitor;
711+
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
712+
type Value = GetInventorySnapshotRequest;
713+
714+
fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
715+
formatter.write_str("struct akash.inventory.v1.GetInventorySnapshotRequest")
716+
}
717+
718+
fn visit_map<V>(self, mut map_: V) -> std::result::Result<GetInventorySnapshotRequest, V::Error>
719+
where
720+
V: serde::de::MapAccess<'de>,
721+
{
722+
let mut nonce__ = None;
723+
while let Some(k) = map_.next_key()? {
724+
match k {
725+
GeneratedField::Nonce => {
726+
if nonce__.is_some() {
727+
return Err(serde::de::Error::duplicate_field("nonce"));
728+
}
729+
nonce__ =
730+
Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
731+
;
732+
}
733+
}
734+
}
735+
Ok(GetInventorySnapshotRequest {
736+
nonce: nonce__.unwrap_or_default(),
737+
})
738+
}
739+
}
740+
deserializer.deserialize_struct("akash.inventory.v1.GetInventorySnapshotRequest", FIELDS, GeneratedVisitor)
741+
}
742+
}
743+
impl serde::Serialize for GetInventorySnapshotResponse {
744+
#[allow(deprecated)]
745+
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
746+
where
747+
S: serde::Serializer,
748+
{
749+
use serde::ser::SerializeStruct;
750+
let mut len = 0;
751+
if !self.snapshot_payload.is_empty() {
752+
len += 1;
753+
}
754+
if !self.signature.is_empty() {
755+
len += 1;
756+
}
757+
if !self.provider.is_empty() {
758+
len += 1;
759+
}
760+
let mut struct_ser = serializer.serialize_struct("akash.inventory.v1.GetInventorySnapshotResponse", len)?;
761+
if !self.snapshot_payload.is_empty() {
762+
#[allow(clippy::needless_borrow)]
763+
#[allow(clippy::needless_borrows_for_generic_args)]
764+
struct_ser.serialize_field("snapshotPayload", pbjson::private::base64::encode(&self.snapshot_payload).as_str())?;
765+
}
766+
if !self.signature.is_empty() {
767+
#[allow(clippy::needless_borrow)]
768+
#[allow(clippy::needless_borrows_for_generic_args)]
769+
struct_ser.serialize_field("signature", pbjson::private::base64::encode(&self.signature).as_str())?;
770+
}
771+
if !self.provider.is_empty() {
772+
struct_ser.serialize_field("provider", &self.provider)?;
773+
}
774+
struct_ser.end()
775+
}
776+
}
777+
impl<'de> serde::Deserialize<'de> for GetInventorySnapshotResponse {
778+
#[allow(deprecated)]
779+
fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
780+
where
781+
D: serde::Deserializer<'de>,
782+
{
783+
const FIELDS: &[&str] = &[
784+
"snapshot_payload",
785+
"snapshotPayload",
786+
"signature",
787+
"provider",
788+
];
789+
790+
#[allow(clippy::enum_variant_names)]
791+
enum GeneratedField {
792+
SnapshotPayload,
793+
Signature,
794+
Provider,
795+
}
796+
impl<'de> serde::Deserialize<'de> for GeneratedField {
797+
fn deserialize<D>(deserializer: D) -> std::result::Result<GeneratedField, D::Error>
798+
where
799+
D: serde::Deserializer<'de>,
800+
{
801+
struct GeneratedVisitor;
802+
803+
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
804+
type Value = GeneratedField;
805+
806+
fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
807+
write!(formatter, "expected one of: {:?}", &FIELDS)
808+
}
809+
810+
#[allow(unused_variables)]
811+
fn visit_str<E>(self, value: &str) -> std::result::Result<GeneratedField, E>
812+
where
813+
E: serde::de::Error,
814+
{
815+
match value {
816+
"snapshotPayload" | "snapshot_payload" => Ok(GeneratedField::SnapshotPayload),
817+
"signature" => Ok(GeneratedField::Signature),
818+
"provider" => Ok(GeneratedField::Provider),
819+
_ => Err(serde::de::Error::unknown_field(value, FIELDS)),
820+
}
821+
}
822+
}
823+
deserializer.deserialize_identifier(GeneratedVisitor)
824+
}
825+
}
826+
struct GeneratedVisitor;
827+
impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
828+
type Value = GetInventorySnapshotResponse;
829+
830+
fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
831+
formatter.write_str("struct akash.inventory.v1.GetInventorySnapshotResponse")
832+
}
833+
834+
fn visit_map<V>(self, mut map_: V) -> std::result::Result<GetInventorySnapshotResponse, V::Error>
835+
where
836+
V: serde::de::MapAccess<'de>,
837+
{
838+
let mut snapshot_payload__ = None;
839+
let mut signature__ = None;
840+
let mut provider__ = None;
841+
while let Some(k) = map_.next_key()? {
842+
match k {
843+
GeneratedField::SnapshotPayload => {
844+
if snapshot_payload__.is_some() {
845+
return Err(serde::de::Error::duplicate_field("snapshotPayload"));
846+
}
847+
snapshot_payload__ =
848+
Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
849+
;
850+
}
851+
GeneratedField::Signature => {
852+
if signature__.is_some() {
853+
return Err(serde::de::Error::duplicate_field("signature"));
854+
}
855+
signature__ =
856+
Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0)
857+
;
858+
}
859+
GeneratedField::Provider => {
860+
if provider__.is_some() {
861+
return Err(serde::de::Error::duplicate_field("provider"));
862+
}
863+
provider__ = Some(map_.next_value()?);
864+
}
865+
}
866+
}
867+
Ok(GetInventorySnapshotResponse {
868+
snapshot_payload: snapshot_payload__.unwrap_or_default(),
869+
signature: signature__.unwrap_or_default(),
870+
provider: provider__.unwrap_or_default(),
871+
})
872+
}
873+
}
874+
deserializer.deserialize_struct("akash.inventory.v1.GetInventorySnapshotResponse", FIELDS, GeneratedVisitor)
875+
}
876+
}
648877
impl serde::Serialize for Memory {
649878
#[allow(deprecated)]
650879
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>

0 commit comments

Comments
 (0)