feat: unify SignedPod and MainPod traits (#64)
* feat: unify SignedPod and MainPod traits * fix: test * feat: enable workflows after draft
This commit is contained in:
parent
452bda8087
commit
1b6e0c9395
7 changed files with 73 additions and 92 deletions
|
|
@ -1,6 +1,6 @@
|
|||
use crate::middleware::{
|
||||
containers::Dictionary, hash_str, Hash, Params, PodId, PodSigner, PodType, SignedPod, Value,
|
||||
KEY_SIGNER, KEY_TYPE,
|
||||
containers::Dictionary, hash_str, AnchoredKey, Hash, NativeStatement, Params, Pod, PodId,
|
||||
PodSigner, PodType, Statement, StatementArg, Value, KEY_SIGNER, KEY_TYPE,
|
||||
};
|
||||
use crate::primitives::merkletree::MerkleTree;
|
||||
use anyhow::Result;
|
||||
|
|
@ -12,7 +12,7 @@ pub struct MockSigner {
|
|||
}
|
||||
|
||||
impl PodSigner for MockSigner {
|
||||
fn sign(&mut self, _params: &Params, kvs: &HashMap<Hash, Value>) -> Result<Box<dyn SignedPod>> {
|
||||
fn sign(&mut self, _params: &Params, kvs: &HashMap<Hash, Value>) -> Result<Box<dyn Pod>> {
|
||||
let mut kvs = kvs.clone();
|
||||
let pk_hash = hash_str(&self.pk);
|
||||
kvs.insert(hash_str(&KEY_SIGNER), Value(pk_hash.0));
|
||||
|
|
@ -36,7 +36,7 @@ pub struct MockSignedPod {
|
|||
dict: Dictionary,
|
||||
}
|
||||
|
||||
impl SignedPod for MockSignedPod {
|
||||
impl Pod for MockSignedPod {
|
||||
fn verify(&self) -> bool {
|
||||
// Verify type
|
||||
let value_at_type = match self.dict.get(&hash_str(&KEY_TYPE).into()) {
|
||||
|
|
@ -77,10 +77,19 @@ impl SignedPod for MockSignedPod {
|
|||
self.id
|
||||
}
|
||||
|
||||
fn kvs(&self) -> HashMap<Hash, Value> {
|
||||
fn pub_statements(&self) -> Vec<Statement> {
|
||||
let id = self.id();
|
||||
self.dict
|
||||
.into_iter()
|
||||
.map(|(&k, &v)| (Hash(k.0), v))
|
||||
.iter()
|
||||
.map(|(k, v)| {
|
||||
Statement(
|
||||
NativeStatement::ValueOf,
|
||||
vec![
|
||||
StatementArg::Key(AnchoredKey(id, Hash(k.0))),
|
||||
StatementArg::Literal(*v),
|
||||
],
|
||||
)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
|
|
@ -95,6 +104,7 @@ pub mod tests {
|
|||
use crate::frontend;
|
||||
use crate::middleware::{self, F, NULL};
|
||||
use plonky2::field::types::Field;
|
||||
use std::iter;
|
||||
|
||||
#[test]
|
||||
fn test_mock_signed_0() {
|
||||
|
|
@ -121,22 +131,24 @@ pub mod tests {
|
|||
assert_eq!(bad_pod.verify(), false);
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
let mut bad_kvs = bad_pod.kvs();
|
||||
bad_kvs.insert(hash_str(KEY_SIGNER), Value(PodId(NULL).0 .0));
|
||||
let bad_kvs_mt = &bad_kvs
|
||||
let bad_kv = (hash_str(KEY_SIGNER).into(), Value(PodId(NULL).0 .0));
|
||||
let bad_kvs_mt = &bad_pod
|
||||
.kvs()
|
||||
.into_iter()
|
||||
.map(|(k, v)| (Value(k.0), v))
|
||||
.map(|(AnchoredKey(_, k), v)| (Value(k.0), v))
|
||||
.chain(iter::once(bad_kv))
|
||||
.collect::<HashMap<Value, Value>>();
|
||||
let bad_mt = MerkleTree::new(&bad_kvs_mt);
|
||||
bad_pod.dict.mt = bad_mt;
|
||||
assert_eq!(bad_pod.verify(), false);
|
||||
|
||||
let mut bad_pod = pod.clone();
|
||||
let mut bad_kvs = bad_pod.kvs();
|
||||
bad_kvs.insert(hash_str(KEY_TYPE), Value::from(0));
|
||||
let bad_kvs_mt = &bad_kvs
|
||||
let bad_kv = (hash_str(KEY_TYPE).into(), Value::from(0));
|
||||
let bad_kvs_mt = &bad_pod
|
||||
.kvs()
|
||||
.into_iter()
|
||||
.map(|(k, v)| (Value(k.0), v))
|
||||
.map(|(AnchoredKey(_, k), v)| (Value(k.0), v))
|
||||
.chain(iter::once(bad_kv))
|
||||
.collect::<HashMap<Value, Value>>();
|
||||
let bad_mt = MerkleTree::new(&bad_kvs_mt);
|
||||
bad_pod.dict.mt = bad_mt;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue