From 511efa8d4477a0d936bd898a484e3b41454b1991 Mon Sep 17 00:00:00 2001 From: "Eduard S." Date: Thu, 28 Aug 2025 02:48:43 +0200 Subject: [PATCH] rename some old id to sts_hash (#402) --- src/backends/plonky2/mainpod/mod.rs | 4 ++-- src/backends/plonky2/mock/emptypod.rs | 4 ++-- src/backends/plonky2/mock/mainpod.rs | 8 ++++---- src/frontend/mod.rs | 20 ++------------------ src/frontend/serialization.rs | 10 +++++----- src/middleware/mod.rs | 2 +- src/middleware/pod_deserialization.rs | 12 +++++++----- 7 files changed, 23 insertions(+), 37 deletions(-) diff --git a/src/backends/plonky2/mainpod/mod.rs b/src/backends/plonky2/mainpod/mod.rs index 828b78b..9bd8211 100644 --- a/src/backends/plonky2/mainpod/mod.rs +++ b/src/backends/plonky2/mainpod/mod.rs @@ -784,7 +784,7 @@ impl Pod for MainPod { params: Params, data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result { let data: Data = serde_json::from_value(data)?; let common = cache_get_rec_main_pod_common_circuit_data(¶ms); @@ -792,7 +792,7 @@ impl Pod for MainPod { let verifier_only = deserialize_verifier_only(&data.verifier_only)?; Ok(Self { params, - sts_hash: id, + sts_hash, verifier_only, common_hash: data.common_hash, vd_set, diff --git a/src/backends/plonky2/mock/emptypod.rs b/src/backends/plonky2/mock/emptypod.rs index 1e5019d..d8c5611 100644 --- a/src/backends/plonky2/mock/emptypod.rs +++ b/src/backends/plonky2/mock/emptypod.rs @@ -87,11 +87,11 @@ impl Pod for MockEmptyPod { params: Params, _data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result { Ok(Self { params, - sts_hash: id, + sts_hash, vd_set, }) } diff --git a/src/backends/plonky2/mock/mainpod.rs b/src/backends/plonky2/mock/mainpod.rs index cd9361c..2fe6807 100644 --- a/src/backends/plonky2/mock/mainpod.rs +++ b/src/backends/plonky2/mock/mainpod.rs @@ -338,7 +338,7 @@ impl Pod for MockMainPod { params: Params, data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result { let Data { public_statements, @@ -351,13 +351,13 @@ impl Pod for MockMainPod { } = serde_json::from_value(data)?; let input_pods = input_pods .into_iter() - .map(|(pod_type, params, id, vd_set, data)| { - deserialize_pod(pod_type, params, id, vd_set, data) + .map(|(pod_type, params, sts_hash, vd_set, data)| { + deserialize_pod(pod_type, params, sts_hash, vd_set, data) }) .collect::>>()?; Ok(Self { params, - sts_hash: id, + sts_hash, vd_set, input_pods, public_statements, diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index 29c93e9..a4a49e2 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -136,7 +136,7 @@ impl fmt::Display for MainPodBuilder { writeln!(f, "MainPod:")?; writeln!(f, " input_main_pods:")?; for in_pod in &self.input_pods { - writeln!(f, " - {}", in_pod.id())?; + writeln!(f, " - {}", in_pod.statements_hash())?; } writeln!(f, " statements:")?; for (st, op) in self.statements.iter().zip_eq(self.operations.iter()) { @@ -662,25 +662,9 @@ impl fmt::Display for MainPod { } impl MainPod { - pub fn id(&self) -> Hash { + pub fn statements_hash(&self) -> Hash { self.pod.statements_hash() } - - /// Returns the value of a Equal statement with self id that defines key if it exists. - pub fn get(&self, key: impl Into) -> Option { - let key: Key = key.into(); - self.public_statements - .iter() - .find_map(|st| match st { - Statement::Equal(ValueRef::Key(ak), ValueRef::Literal(value)) - if ak.root == self.id() && ak.key.hash() == key.hash() => - { - Some(value) - } - _ => None, - }) - .cloned() - } } struct MainPodCompilerInputs<'a> { diff --git a/src/frontend/serialization.rs b/src/frontend/serialization.rs index 8bcc39b..9e2d020 100644 --- a/src/frontend/serialization.rs +++ b/src/frontend/serialization.rs @@ -13,15 +13,15 @@ use crate::{ pub struct SerializedMainPod { params: Params, pod_type: (usize, String), - id: Hash, + sts_hash: Hash, vd_set: VDSet, public_statements: Vec, data: serde_json::Value, } impl SerializedMainPod { - pub fn id(&self) -> Hash { - self.id + pub fn statements_hash(&self) -> Hash { + self.sts_hash } } @@ -31,7 +31,7 @@ impl From for SerializedMainPod { let data = pod.pod.serialize_data(); SerializedMainPod { pod_type: (pod_type, pod_type_name_str.to_string()), - id: pod.id(), + sts_hash: pod.statements_hash(), vd_set: pod.pod.vd_set().clone(), params: pod.params.clone(), public_statements: pod.pod.pub_statements(), @@ -47,7 +47,7 @@ impl TryFrom for MainPod { let pod = deserialize_pod( serialized.pod_type.0, serialized.params.clone(), - serialized.id, + serialized.sts_hash, serialized.vd_set, serialized.data, )?; diff --git a/src/middleware/mod.rs b/src/middleware/mod.rs index dfd2d97..1deef9e 100644 --- a/src/middleware/mod.rs +++ b/src/middleware/mod.rs @@ -938,7 +938,7 @@ pub trait Pod: fmt::Debug + DynClone + Sync + Send + Any + EqualsAny { params: Params, data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result where Self: Sized; diff --git a/src/middleware/pod_deserialization.rs b/src/middleware/pod_deserialization.rs index d863e04..ed131e9 100644 --- a/src/middleware/pod_deserialization.rs +++ b/src/middleware/pod_deserialization.rs @@ -9,7 +9,7 @@ type DeserializeFn = fn( params: Params, data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result, BackendError>; static DESERIALIZERS: LazyLock>> = @@ -25,7 +25,7 @@ pub fn register_pod_deserializer(pod_type: usize, deserialize_fn: DeserializeFn) pub fn deserialize_pod( pod_type: usize, params: Params, - id: Hash, + sts_hash: Hash, vd_set: VDSet, data: serde_json::Value, ) -> Result, BackendError> { @@ -39,7 +39,7 @@ pub fn deserialize_pod( pod_type )))?; - deserialize_fn(params, data, vd_set, id) + deserialize_fn(params, data, vd_set, sts_hash) } #[cfg(feature = "backend_plonky2")] @@ -56,9 +56,11 @@ mod backend { params: Params, data: serde_json::Value, vd_set: VDSet, - id: Hash, + sts_hash: Hash, ) -> Result, BackendError> { - Ok(Box::new(P::deserialize_data(params, data, vd_set, id)?)) + Ok(Box::new(P::deserialize_data( + params, data, vd_set, sts_hash, + )?)) } let mut map: HashMap = HashMap::new();