penumbra: more workshopping in protofiles

crates/core/asset/src/asset/denom_metadata.rs

@@ -63,7 +63,7 @@ impl From<&Inner> for pb::Metadata {
             display: inner.units[inner.display_index].denom.clone(),
             name: inner.name.clone(),
             symbol: inner.symbol.clone(),
-            penumbra_sdk_asset_id: Some(inner.id.into()),
+            penumbra_asset_id: Some(inner.id.into()),
             denom_units: inner.units.clone().into_iter().map(|x| x.into()).collect(),
             images: inner.images.clone(),
             badges: inner.badges.clone(),
@@ -85,7 +85,7 @@ impl TryFrom<pb::Metadata> for Inner {
         // Compute the ID from the base denom to ensure we don't get confused.
         let id = Id::from_raw_denom(&base_denom);
         // If the ID was supplied, we should check that it's consistent with the base denom.
-        if let Some(supplied_id) = value.penumbra_sdk_asset_id {
+        if let Some(supplied_id) = value.penumbra_asset_id {
             let supplied_id = Id::try_from(supplied_id)?;
             ensure!(
                 id == supplied_id,

crates/core/component/funding/src/component/metrics.rs

@@ -40,8 +40,7 @@ pub fn register_metrics() {
     );
 }
 
-pub const TOTAL_VALIDATOR_REWARDS: &str =
-    "penumbra_funding_total_validator_rewards_staking_token";
+pub const TOTAL_VALIDATOR_REWARDS: &str = "penumbra_funding_total_validator_rewards_staking_token";
 pub const VALIDATOR_FUNDING_VS_BUDGET_DIFFERENCE: &str =
     "penumbra_funding_validator_vs_budget_difference_staking_token";
 pub const FETCH_FUNDING_QUEUE_LATENCY: &str =

crates/proto/src/lib.rs

@@ -225,13 +225,6 @@ pub mod penumbra {
         }
     }
 
-    pub mod cnidarium {
-        pub mod v1 {
-            include!("gen/penumbra.cnidarium.v1.rs");
-            include!("gen/penumbra.cnidarium.v1.serde.rs");
-        }
-    }
-
     pub mod util {
         pub mod tendermint_proxy {
             pub mod v1 {