From 873f8402dea63860fbff95dd09c64a88816748fa Mon Sep 17 00:00:00 2001 From: Tal Derei Date: Sun, 9 Feb 2025 10:35:02 -0800 Subject: [PATCH] nit; naming --- crates/proto/src/gen/penumbra.view.v1.rs | 2 +- .../proto/src/gen/penumbra.view.v1.serde.rs | 26 +++++++++--------- .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 663552 -> 663546 bytes proto/penumbra/penumbra/view/v1/view.proto | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/proto/src/gen/penumbra.view.v1.rs b/crates/proto/src/gen/penumbra.view.v1.rs index 56ffb06ef5..7aa95d1b86 100644 --- a/crates/proto/src/gen/penumbra.view.v1.rs +++ b/crates/proto/src/gen/penumbra.view.v1.rs @@ -817,7 +817,7 @@ pub mod transaction_planner_request { pub staked_note: ::core::option::Option, /// The epoch index of the tournament. #[prost(uint64, tag = "4")] - pub epoch_position: u64, + pub epoch_index: u64, } impl ::prost::Name for ActionLiquidityTournamentVote { const NAME: &'static str = "ActionLiquidityTournamentVote"; diff --git a/crates/proto/src/gen/penumbra.view.v1.serde.rs b/crates/proto/src/gen/penumbra.view.v1.serde.rs index 0cf41fc4e6..b909f99787 100644 --- a/crates/proto/src/gen/penumbra.view.v1.serde.rs +++ b/crates/proto/src/gen/penumbra.view.v1.serde.rs @@ -7856,7 +7856,7 @@ impl serde::Serialize for transaction_planner_request::ActionLiquidityTournament if self.staked_note.is_some() { len += 1; } - if self.epoch_position != 0 { + if self.epoch_index != 0 { len += 1; } let mut struct_ser = serializer.serialize_struct("penumbra.view.v1.TransactionPlannerRequest.ActionLiquidityTournamentVote", len)?; @@ -7869,10 +7869,10 @@ impl serde::Serialize for transaction_planner_request::ActionLiquidityTournament if let Some(v) = self.staked_note.as_ref() { struct_ser.serialize_field("stakedNote", v)?; } - if self.epoch_position != 0 { + if self.epoch_index != 0 { #[allow(clippy::needless_borrow)] #[allow(clippy::needless_borrows_for_generic_args)] - struct_ser.serialize_field("epochPosition", ToString::to_string(&self.epoch_position).as_str())?; + struct_ser.serialize_field("epochIndex", ToString::to_string(&self.epoch_index).as_str())?; } struct_ser.end() } @@ -7889,8 +7889,8 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi "rewardsRecipient", "staked_note", "stakedNote", - "epoch_position", - "epochPosition", + "epoch_index", + "epochIndex", ]; #[allow(clippy::enum_variant_names)] @@ -7898,7 +7898,7 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi Incentivized, RewardsRecipient, StakedNote, - EpochPosition, + EpochIndex, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -7924,7 +7924,7 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi "incentivized" => Ok(GeneratedField::Incentivized), "rewardsRecipient" | "rewards_recipient" => Ok(GeneratedField::RewardsRecipient), "stakedNote" | "staked_note" => Ok(GeneratedField::StakedNote), - "epochPosition" | "epoch_position" => Ok(GeneratedField::EpochPosition), + "epochIndex" | "epoch_index" => Ok(GeneratedField::EpochIndex), _ => Ok(GeneratedField::__SkipField__), } } @@ -7947,7 +7947,7 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi let mut incentivized__ = None; let mut rewards_recipient__ = None; let mut staked_note__ = None; - let mut epoch_position__ = None; + let mut epoch_index__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Incentivized => { @@ -7968,11 +7968,11 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi } staked_note__ = map_.next_value()?; } - GeneratedField::EpochPosition => { - if epoch_position__.is_some() { - return Err(serde::de::Error::duplicate_field("epochPosition")); + GeneratedField::EpochIndex => { + if epoch_index__.is_some() { + return Err(serde::de::Error::duplicate_field("epochIndex")); } - epoch_position__ = + epoch_index__ = Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } @@ -7985,7 +7985,7 @@ impl<'de> serde::Deserialize<'de> for transaction_planner_request::ActionLiquidi incentivized: incentivized__.unwrap_or_default(), rewards_recipient: rewards_recipient__, staked_note: staked_note__, - epoch_position: epoch_position__.unwrap_or_default(), + epoch_index: epoch_index__.unwrap_or_default(), }) } } diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 6374b7fffab8bcc5f6185e6755b88c3b433de0b7..d89170cf2770b017fc81c825908827254606f193 100644 GIT binary patch delta 133 zcmZoTpz&+JMnel@3sVbo3(FQ(o_maEw)5U&y~xAZvHkul)?`7J8BAQV(?7a1%T7=J z!+KLeo{KxRAU`=HJ~J;RwL*eLfl-4chzl&_2@=_!^q1AXicxy{qH;EOAu%p~E_N0k fW=zsuQxm>q~Yw*M~YWL*IOO=2wI delta 139 zcmeyhU!&oGMnel@3sVbo3(FQ(o_ma!w)5U&y~xAZxBdPr)?`7Jc}!fg(?7a1%T7=J z!+KLqm5VR6AU`=Hz97Fivm`S=Pl82(QG+Fj7c3e872F>4m({+CQEvL2ayEA%NiKda ib`~CHJ|<>nA(o@eGP3Po%h`aK9f&!$e=X-^T>${7*)OI5 diff --git a/proto/penumbra/penumbra/view/v1/view.proto b/proto/penumbra/penumbra/view/v1/view.proto index 51bb1e79b2..16e3a23c75 100644 --- a/proto/penumbra/penumbra/view/v1/view.proto +++ b/proto/penumbra/penumbra/view/v1/view.proto @@ -451,7 +451,7 @@ message TransactionPlannerRequest { // The note containing the staked note used for voting. SpendableNoteRecord staked_note = 3; // The epoch index of the tournament. - uint64 epoch_position = 4; + uint64 epoch_index = 4; } }