remove MockSignedPod (#339)

- breaking change: Removal of MockSignedPod.  Use SignedPod instead.
- breaking change: Redefinition of numerical id for values of PodType.
This commit is contained in:
Eduard S. 2025-07-15 11:19:19 +02:00 committed by GitHub
parent 06b84e8dca
commit b5e0d97cb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 79 additions and 358 deletions

View file

@ -255,7 +255,7 @@ mod tests {
params.print_serialized_sizes();
// ETH friend custom predicate batch
let eth_dos_batch = eth_dos_batch(&params, true)?;
let eth_dos_batch = eth_dos_batch(&params)?;
// This batch only has 1 predicate, so we pick it already for convenience
let eth_friend = eth_dos_batch.predicate_ref_by_name("eth_friend").unwrap();

View file

@ -831,7 +831,9 @@ pub mod tests {
use super::*;
use crate::{
backends::plonky2::mock::{mainpod::MockProver, signedpod::MockSigner},
backends::plonky2::{
mock::mainpod::MockProver, primitives::ec::schnorr::SecretKey, signedpod::Signer,
},
examples::{
attest_eth_friend, great_boy_pod_full_flow, tickets_pod_full_flow, zu_kyc_pod_builder,
zu_kyc_sign_pod_builders, EthDosHelper, MOCK_VD_SET,
@ -877,23 +879,17 @@ pub mod tests {
println!("{}", gov_id);
println!("{}", pay_stub);
let mut signer = MockSigner {
pk: "ZooGov".into(),
};
let mut signer = Signer(SecretKey(1u32.into()));
let gov_id = gov_id.sign(&mut signer)?;
check_kvs(&gov_id)?;
println!("{}", gov_id);
let mut signer = MockSigner {
pk: "ZooDeel".into(),
};
let mut signer = Signer(SecretKey(2u32.into()));
let pay_stub = pay_stub.sign(&mut signer)?;
check_kvs(&pay_stub)?;
println!("{}", pay_stub);
let mut signer = MockSigner {
pk: "ZooOFAC".into(),
};
let mut signer = Signer(SecretKey(3u32.into()));
let sanction_list = sanction_list.sign(&mut signer)?;
check_kvs(&sanction_list)?;
println!("{}", sanction_list);
@ -920,12 +916,10 @@ pub mod tests {
};
let vd_set = &*MOCK_VD_SET;
let mut alice = MockSigner { pk: "Alice".into() };
let mut bob = MockSigner { pk: "Bob".into() };
let mut charlie = MockSigner {
pk: "Charlie".into(),
};
let david = MockSigner { pk: "David".into() };
let mut alice = Signer(SecretKey(1u32.into()));
let mut bob = Signer(SecretKey(2u32.into()));
let mut charlie = Signer(SecretKey(3u32.into()));
let david = Signer(SecretKey(4u32.into()));
let helper = EthDosHelper::new(&params, vd_set, true, alice.public_key())?;
@ -980,7 +974,7 @@ pub mod tests {
let mut signed_builder = SignedPodBuilder::new(&params);
signed_builder.insert("a", 1);
signed_builder.insert("b", 1);
let mut signer = MockSigner { pk: "key".into() };
let mut signer = Signer(SecretKey(1u32.into()));
let signed_pod = signed_builder.sign(&mut signer).unwrap();
let mut builder = MainPodBuilder::new(&params, &vd_set);
@ -1031,10 +1025,7 @@ pub mod tests {
let mut builder = SignedPodBuilder::new(&params);
builder.insert("num", 2);
let mut signer = MockSigner {
pk: "signer".into(),
};
let mut signer = Signer(SecretKey(1u32.into()));
let pod = builder.sign(&mut signer).unwrap();
println!("{}", pod);
@ -1066,9 +1057,7 @@ pub mod tests {
let dict_root = Value::from(dict.clone());
builder.insert("dict", dict_root);
let mut signer = MockSigner {
pk: "signer".into(),
};
let mut signer = Signer(SecretKey(1u32.into()));
let pod = builder.sign(&mut signer).unwrap();
let mut builder = MainPodBuilder::new(&params, &vd_set);

View file

@ -107,9 +107,7 @@ mod tests {
use super::*;
use crate::{
backends::plonky2::{
mainpod::Prover,
mock::{mainpod::MockProver, signedpod::MockSigner},
primitives::ec::schnorr::SecretKey,
mainpod::Prover, mock::mainpod::MockProver, primitives::ec::schnorr::SecretKey,
signedpod::Signer,
},
examples::{
@ -242,7 +240,7 @@ mod tests {
#[test]
fn test_mock_signed_pod_serialization() {
let builder = signed_pod_builder();
let mut signer = MockSigner { pk: "test".into() };
let mut signer = Signer(SecretKey(1u32.into()));
let pod = builder.sign(&mut signer).unwrap();
let serialized = serde_json::to_string_pretty(&pod).unwrap();
@ -263,17 +261,11 @@ mod tests {
let (gov_id_builder, pay_stub_builder, sanction_list_builder) =
zu_kyc_sign_pod_builders(&params);
let mut signer = MockSigner {
pk: "ZooGov".into(),
};
let mut signer = Signer(SecretKey(1u32.into()));
let gov_id_pod = gov_id_builder.sign(&mut signer).unwrap();
let mut signer = MockSigner {
pk: "ZooDeel".into(),
};
let mut signer = Signer(SecretKey(2u32.into()));
let pay_stub_pod = pay_stub_builder.sign(&mut signer).unwrap();
let mut signer = MockSigner {
pk: "ZooOFAC".into(),
};
let mut signer = Signer(SecretKey(3u32.into()));
let sanction_list_pod = sanction_list_builder.sign(&mut signer).unwrap();
let kyc_builder = zu_kyc_pod_builder(
&params,
@ -356,11 +348,9 @@ mod tests {
};
let vd_set = &*MOCK_VD_SET;
let mut alice = MockSigner { pk: "Alice".into() };
let mut bob = MockSigner { pk: "Bob".into() };
let charlie = MockSigner {
pk: "Charlie".into(),
};
let mut alice = Signer(SecretKey(1u32.into()));
let mut bob = Signer(SecretKey(2u32.into()));
let charlie = Signer(SecretKey(3u32.into()));
// Alice attests that she is ETH friends with Bob and Bob
// attests that he is ETH friends with Charlie.
@ -390,7 +380,7 @@ mod tests {
let kyc_pod = build_mock_zukyc_pod().unwrap();
let signed_pod = signed_pod_builder()
.sign(&mut MockSigner { pk: "test".into() })
.sign(&mut Signer(SecretKey(1u32.into())))
.unwrap();
let ethdos_pod = build_ethdos_pod().unwrap();
let mainpod_schema_value = serde_json::to_value(&mainpod_schema).unwrap();