chore: rename AggregatedProofPublicInfo to `AggregatedProofPublicDa…

…ta` (#112) * chore: rename AggregatedProofPublicInput to AggregatedProofPublicData * deps: update basecoin rev
informalsystems · Mar 29, 2024 · 0da37e3 · 0da37e3
1 parent 0b4a8bc
commit 0da37e3
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/sov-celestia/types/src/client_message/aggregated_proof.rs b/clients/sov-celestia/types/src/client_message/aggregated_proof.rs
@@ -8,30 +8,27 @@ use crate::client_message::pretty::PrettySlice;
 use crate::error::Error;
 use crate::proto::types::v1::{
     AggregatedProof as RawAggregatedProof, AggregatedProofData as RawAggregatedProofData,
-    AggregatedProofPublicInput as RawAggregatedProofPublicInput,
-    CodeCommitment as RawCodeCommitment, ValidityCondition as RawValidityCondition,
+    AggregatedProofPublicData as RawAggregatedProofPublicData, CodeCommitment as RawCodeCommitment,
+    ValidityCondition as RawValidityCondition,
 };
 
 /// Defines the aggregated proof data structure for the Sovereign SDK rollups
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AggregatedProofData {
-    pub public_input: AggregatedProofPublicInput,
+    pub public_input: AggregatedProofPublicData,
     pub aggregated_proof: AggregatedProof,
 }
 
 impl AggregatedProofData {
-    pub fn new(
-        public_input: AggregatedProofPublicInput,
-        aggregated_proof: AggregatedProof,
-    ) -> Self {
+    pub fn new(public_input: AggregatedProofPublicData, aggregated_proof: AggregatedProof) -> Self {
         Self {
             public_input,
             aggregated_proof,
         }
     }
 
-    pub fn public_input(&self) -> &AggregatedProofPublicInput {
+    pub fn public_input(&self) -> &AggregatedProofPublicData {
         &self.public_input
     }
 
@@ -82,7 +79,7 @@ impl From<AggregatedProofData> for RawAggregatedProofData {
 /// rollups, utilized for verifying the proof.
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-pub struct AggregatedProofPublicInput {
+pub struct AggregatedProofPublicData {
     pub validity_conditions: Vec<ValidityCondition>,
     pub initial_slot_number: Height,
     pub final_slot_number: Height,
@@ -94,7 +91,7 @@ pub struct AggregatedProofPublicInput {
     pub code_commitment: CodeCommitment,
 }
 
-impl AggregatedProofPublicInput {
+impl AggregatedProofPublicData {
     pub fn initial_slot_number(&self) -> Height {
         self.initial_slot_number
     }
@@ -116,11 +113,11 @@ impl AggregatedProofPublicInput {
     }
 }
 
-impl Display for AggregatedProofPublicInput {
+impl Display for AggregatedProofPublicData {
     fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
         write!(
                 f,
-                "AggregatedProofPublicInput {{ validity_conditions: {}, initial_slot_number: {}, final_slot_number: {}, initial_slot_hash: {}, final_slot_hash: {}, genesis_state_root: {}, input_state_root: {}, post_state_root: {}, code_commitment: {} }}",
+                "AggregatedProofPublicData {{ validity_conditions: {}, initial_slot_number: {}, final_slot_number: {}, initial_slot_hash: {}, final_slot_hash: {}, genesis_state_root: {}, input_state_root: {}, post_state_root: {}, code_commitment: {} }}",
                 PrettySlice(&self.validity_conditions),
                 self.initial_slot_number,
                 self.final_slot_number,
@@ -134,12 +131,12 @@ impl Display for AggregatedProofPublicInput {
     }
 }
 
-impl Protobuf<RawAggregatedProofPublicInput> for AggregatedProofPublicInput {}
+impl Protobuf<RawAggregatedProofPublicData> for AggregatedProofPublicData {}
 
-impl TryFrom<RawAggregatedProofPublicInput> for AggregatedProofPublicInput {
+impl TryFrom<RawAggregatedProofPublicData> for AggregatedProofPublicData {
     type Error = Error;
 
-    fn try_from(raw: RawAggregatedProofPublicInput) -> Result<Self, Self::Error> {
+    fn try_from(raw: RawAggregatedProofPublicData) -> Result<Self, Self::Error> {
         Ok(Self {
             validity_conditions: raw
                 .validity_conditions
@@ -161,8 +158,8 @@ impl TryFrom<RawAggregatedProofPublicInput> for AggregatedProofPublicInput {
     }
 }
 
-impl From<AggregatedProofPublicInput> for RawAggregatedProofPublicInput {
-    fn from(value: AggregatedProofPublicInput) -> Self {
+impl From<AggregatedProofPublicData> for RawAggregatedProofPublicData {
+    fn from(value: AggregatedProofPublicData) -> Self {
         Self {
             validity_conditions: value
                 .validity_conditions

diff --git a/clients/sov-celestia/types/src/client_message/mod.rs b/clients/sov-celestia/types/src/client_message/mod.rs
@@ -117,7 +117,7 @@ pub mod test_util {
         pub code_commitment: CodeCommitment,
     }
 
-    impl From<PublicInputConfig> for AggregatedProofPublicInput {
+    impl From<PublicInputConfig> for AggregatedProofPublicData {
         fn from(config: PublicInputConfig) -> Self {
             Self {
                 validity_conditions: config.validity_conditions,

diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml
@@ -29,10 +29,10 @@ tracing       = "0.1.36"
 typed-builder = "0.18.0"
 
 # internal dependencies
-sov-ibc                     = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "66138b87" }
-sov-ibc-transfer            = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "66138b87" }
-sov-consensus-state-tracker = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "66138b87" }
-sov-celestia-client         = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "66138b87", features = ["test-util"] }
+sov-ibc                     = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "81e006fe" }
+sov-ibc-transfer            = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "81e006fe" }
+sov-consensus-state-tracker = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "81e006fe" }
+sov-celestia-client         = { git = "https://github.com/informalsystems/sovereign-ibc.git", rev = "81e006fe", features = ["test-util"] }
 
 # ibc dependencies
 ibc-core              = { workspace = true }
@@ -43,7 +43,7 @@ ibc-query             = { workspace = true }
 ibc-testkit           = { workspace = true }
 
 # cosmos dependencies
-basecoin             = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "8f9a6f1" }
+basecoin             = { git = "https://github.com/informalsystems/basecoin-rs.git", rev = "c7807d4" }
 tendermint           = { workspace = true }
 tendermint-testgen   = { workspace = true }
 

diff --git a/proto/definitions/sovereign/types/v1/types.proto b/proto/definitions/sovereign/types/v1/types.proto
@@ -8,15 +8,15 @@ import "gogoproto/gogo.proto";
 // proof data information, and aggregated proof bytes.
 message AggregatedProofData {
   // the public input of the aggregated proof
-  AggregatedProofPublicInput public_input = 1;
+  AggregatedProofPublicData public_input = 1;
   // the aggregated proof bytes
   AggregatedProof aggregated_proof = 2;
 }
 
 // AggregatedProofPublicInput defines the public properties of the
 // AggregatedProof for the Sovereign SDK rollups, utilized for verifying the
 // proof.
-message AggregatedProofPublicInput {
+message AggregatedProofPublicData {
   // The set of validity conditions for each block of the aggregated proof.
   repeated ValidityCondition validity_conditions = 1 [
     (gogoproto.nullable) = false,

diff --git a/proto/src/prost/proto_descriptor.bin b/proto/src/prost/proto_descriptor.bin
diff --git a/proto/src/prost/sovereign.types.v1.rs b/proto/src/prost/sovereign.types.v1.rs
@@ -5,7 +5,7 @@
 pub struct AggregatedProofData {
     /// the public input of the aggregated proof
     #[prost(message, optional, tag = "1")]
-    pub public_input: ::core::option::Option<AggregatedProofPublicInput>,
+    pub public_input: ::core::option::Option<AggregatedProofPublicData>,
     /// the aggregated proof bytes
     #[prost(message, optional, tag = "2")]
     pub aggregated_proof: ::core::option::Option<AggregatedProof>,
@@ -22,7 +22,7 @@ impl ::prost::Name for AggregatedProofData {
 /// proof.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
-pub struct AggregatedProofPublicInput {
+pub struct AggregatedProofPublicData {
     /// The set of validity conditions for each block of the aggregated proof.
     #[prost(message, repeated, tag = "1")]
     pub validity_conditions: ::prost::alloc::vec::Vec<ValidityCondition>,
@@ -53,8 +53,8 @@ pub struct AggregatedProofPublicInput {
     #[prost(message, optional, tag = "9")]
     pub code_commitment: ::core::option::Option<CodeCommitment>,
 }
-impl ::prost::Name for AggregatedProofPublicInput {
-    const NAME: &'static str = "AggregatedProofPublicInput";
+impl ::prost::Name for AggregatedProofPublicData {
+    const NAME: &'static str = "AggregatedProofPublicData";
     const PACKAGE: &'static str = "sovereign.types.v1";
     fn full_name() -> ::prost::alloc::string::String {
         ::prost::alloc::format!("sovereign.types.v1.{}", Self::NAME)

diff --git a/proto/src/prost/sovereign.types.v1.serde.rs b/proto/src/prost/sovereign.types.v1.serde.rs
@@ -202,7 +202,7 @@ impl<'de> serde::Deserialize<'de> for AggregatedProofData {
         deserializer.deserialize_struct("sovereign.types.v1.AggregatedProofData", FIELDS, GeneratedVisitor)
     }
 }
-impl serde::Serialize for AggregatedProofPublicInput {
+impl serde::Serialize for AggregatedProofPublicData {
     #[allow(deprecated)]
     fn serialize<S>(&self, serializer: S) -> core::result::Result<S::Ok, S::Error>
     where
@@ -237,7 +237,7 @@ impl serde::Serialize for AggregatedProofPublicInput {
         if true {
             len += 1;
         }
-        let mut struct_ser = serializer.serialize_struct("sovereign.types.v1.AggregatedProofPublicInput", len)?;
+        let mut struct_ser = serializer.serialize_struct("sovereign.types.v1.AggregatedProofPublicData", len)?;
         if true {
             struct_ser.serialize_field("validityConditions", &self.validity_conditions)?;
         }
@@ -275,7 +275,7 @@ impl serde::Serialize for AggregatedProofPublicInput {
         struct_ser.end()
     }
 }
-impl<'de> serde::Deserialize<'de> for AggregatedProofPublicInput {
+impl<'de> serde::Deserialize<'de> for AggregatedProofPublicData {
     #[allow(deprecated)]
     fn deserialize<D>(deserializer: D) -> core::result::Result<Self, D::Error>
     where
@@ -352,13 +352,13 @@ impl<'de> serde::Deserialize<'de> for AggregatedProofPublicInput {
         }
         struct GeneratedVisitor;
         impl<'de> serde::de::Visitor<'de> for GeneratedVisitor {
-            type Value = AggregatedProofPublicInput;
+            type Value = AggregatedProofPublicData;
 
             fn expecting(&self, formatter: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-                formatter.write_str("struct sovereign.types.v1.AggregatedProofPublicInput")
+                formatter.write_str("struct sovereign.types.v1.AggregatedProofPublicData")
             }
 
-            fn visit_map<V>(self, mut map_: V) -> core::result::Result<AggregatedProofPublicInput, V::Error>
+            fn visit_map<V>(self, mut map_: V) -> core::result::Result<AggregatedProofPublicData, V::Error>
                 where
                     V: serde::de::MapAccess<'de>,
             {
@@ -443,7 +443,7 @@ impl<'de> serde::Deserialize<'de> for AggregatedProofPublicInput {
                         }
                     }
                 }
-                Ok(AggregatedProofPublicInput {
+                Ok(AggregatedProofPublicData {
                     validity_conditions: validity_conditions__.unwrap_or_default(),
                     initial_slot_number: initial_slot_number__.unwrap_or_default(),
                     final_slot_number: final_slot_number__.unwrap_or_default(),
@@ -456,7 +456,7 @@ impl<'de> serde::Deserialize<'de> for AggregatedProofPublicInput {
                 })
             }
         }
-        deserializer.deserialize_struct("sovereign.types.v1.AggregatedProofPublicInput", FIELDS, GeneratedVisitor)
+        deserializer.deserialize_struct("sovereign.types.v1.AggregatedProofPublicData", FIELDS, GeneratedVisitor)
     }
 }
 impl serde::Serialize for CodeCommitment {