Skip to content

Commit 71dc835

Browse files
ax0ax0
committed
Merge branch 'main' into circuit-ops
2 parents 86ef0b2 + 3b2860b commit 71dc835

File tree

13 files changed

+49
-48
lines changed

13 files changed

+49
-48
lines changed

src/backends/plonky2/common.rs renamed to src/backends/plonky2/circuits/common.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Common functionality to build Pod circuits with plonky2
22
33
use crate::backends::plonky2::basetypes::D;
4-
use crate::backends::plonky2::mock_main::Statement;
5-
use crate::backends::plonky2::mock_main::{Operation, OperationArg};
4+
use crate::backends::plonky2::mock::mainpod::Statement;
5+
use crate::backends::plonky2::mock::mainpod::{Operation, OperationArg};
66
use crate::middleware::{
7-
NativeOperation, NativePredicate, OperationType, Params, Predicate, StatementArg, ToFields,
7+
NativeOperation, NativePredicate, Params, Predicate, StatementArg, ToFields,
88
Value, F, HASH_SIZE, VALUE_SIZE,
99
};
1010
use crate::middleware::{OPERATION_ARG_F_LEN, STATEMENT_ARG_F_LEN};

src/backends/plonky2/main.rs renamed to src/backends/plonky2/circuits/mainpod.rs

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
1-
use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
2-
use crate::backends::plonky2::common::{
3-
CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
4-
};
5-
use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
6-
use crate::backends::plonky2::primitives::merkletree::{
7-
MerkleProofExistenceGate, MerkleProofExistenceTarget,
8-
};
9-
use crate::middleware::{
10-
hash_str, AnchoredKey, NativeOperation, NativePredicate, Params, PodType, Statement,
11-
StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
12-
};
13-
use anyhow::{anyhow, Result};
1+
use anyhow::Result;
142
use itertools::Itertools;
153
use plonky2::{
164
field::types::Field,
@@ -27,6 +15,19 @@ use plonky2::{
2715
use std::collections::HashMap;
2816
use std::iter;
2917

18+
use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
19+
use crate::backends::plonky2::circuits::common::{
20+
CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
21+
};
22+
use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
23+
use crate::backends::plonky2::primitives::merkletree::{
24+
MerkleProofExistenceGate, MerkleProofExistenceTarget,
25+
};
26+
use crate::middleware::{
27+
hash_str, AnchoredKey, NativeOperation, NativePredicate, Params, PodType, Predicate, Statement,
28+
StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
29+
};
30+
3031
//
3132
// SignedPod verification
3233
//
@@ -491,8 +492,8 @@ impl MainPodVerifyCircuit {
491492
#[cfg(test)]
492493
mod tests {
493494
use super::*;
494-
use crate::backends::plonky2::mock_main;
495-
use crate::backends::plonky2::{basetypes::C, mock_main::OperationArg};
495+
use crate::backends::plonky2::{basetypes::C, mock::mainpod::OperationArg};
496+
use crate::backends::plonky2::mock::mainpod;
496497
use crate::middleware::{OperationType, PodId};
497498
use plonky2::plonk::{circuit_builder::CircuitBuilder, circuit_data::CircuitConfig};
498499

@@ -526,9 +527,9 @@ mod tests {
526527
}
527528

528529
fn operation_verify(
529-
st: mock_main::Statement,
530-
op: mock_main::Operation,
531-
prev_statements: Vec<mock_main::Statement>,
530+
st: mainpod::Statement,
531+
op: mainpod::Operation,
532+
prev_statements: Vec<mainpod::Statement>,
532533
) -> Result<()> {
533534
let params = Params::default();
534535

@@ -571,54 +572,54 @@ mod tests {
571572
#[test]
572573
fn test_operation_verify() -> Result<()> {
573574
// None
574-
let st: mock_main::Statement = Statement::None.into();
575-
let op = mock_main::Operation(OperationType::Native(NativeOperation::None), vec![]);
575+
let st: mainpod::Statement = Statement::None.into();
576+
let op = mainpod::Operation(OperationType::Native(NativeOperation::None), vec![]);
576577
let prev_statements = vec![Statement::None.into()];
577578
operation_verify(st.clone(), op, prev_statements.clone())?;
578579

579580
// NewEntry
580-
let st1: mock_main::Statement =
581+
let st1: mainpod::Statement =
581582
Statement::ValueOf(AnchoredKey(SELF, "hello".into()), 55.into()).into();
582-
let op = mock_main::Operation(OperationType::Native(NativeOperation::NewEntry), vec![]);
583+
let op = mainpod::Operation(OperationType::Native(NativeOperation::NewEntry), vec![]);
583584
operation_verify(st1.clone(), op, vec![])?;
584585

585586
// Copy
586-
let op = mock_main::Operation(
587+
let op = mainpod::Operation(
587588
OperationType::Native(NativeOperation::CopyStatement),
588589
vec![OperationArg::Index(0)],
589590
);
590591
operation_verify(st, op, prev_statements)?;
591592

592593
// Eq
593-
let st2: mock_main::Statement = Statement::ValueOf(
594+
let st2: mainpod::Statement = Statement::ValueOf(
594595
AnchoredKey(PodId(Value::from(75).into()), "hello".into()),
595596
55.into(),
596597
)
597598
.into();
598-
let st: mock_main::Statement = Statement::Equal(
599+
let st: mainpod::Statement = Statement::Equal(
599600
AnchoredKey(SELF, "hello".into()),
600601
AnchoredKey(PodId(Value::from(75).into()), "hello".into()),
601602
)
602603
.into();
603-
let op = mock_main::Operation(
604+
let op = mainpod::Operation(
604605
OperationType::Native(NativeOperation::EqualFromEntries),
605606
vec![OperationArg::Index(0), OperationArg::Index(1)],
606607
);
607608
let prev_statements = vec![st1.clone(), st2];
608609
operation_verify(st, op, prev_statements)?;
609610

610611
// Lt
611-
let st2: mock_main::Statement = Statement::ValueOf(
612+
let st2: mainpod::Statement = Statement::ValueOf(
612613
AnchoredKey(PodId(Value::from(88).into()), "hello".into()),
613614
56.into(),
614615
)
615616
.into();
616-
let st: mock_main::Statement = Statement::Lt(
617+
let st: mainpod::Statement = Statement::Lt(
617618
AnchoredKey(SELF, "hello".into()),
618619
AnchoredKey(PodId(Value::from(88).into()), "hello".into()),
619620
)
620621
.into();
621-
let op = mock_main::Operation(
622+
let op = mainpod::Operation(
622623
OperationType::Native(NativeOperation::LtFromEntries),
623624
vec![OperationArg::Index(0), OperationArg::Index(1)],
624625
);

‎src/backends/plonky2/circuits/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pub mod common;
2+
pub mod mainpod;

src/backends/plonky2/mock_main/mod.rs renamed to src/backends/plonky2/mock/mainpod/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ impl Pod for MockMainPod {
505505
#[cfg(test)]
506506
pub mod tests {
507507
use super::*;
508-
use crate::backends::plonky2::mock_signed::MockSigner;
508+
use crate::backends::plonky2::mock::signedpod::MockSigner;
509509
use crate::examples::{
510510
great_boy_pod_full_flow, tickets_pod_full_flow, zu_kyc_pod_builder,
511511
zu_kyc_sign_pod_builders,

src/backends/plonky2/mock_main/operation.rs renamed to src/backends/plonky2/mock/mainpod/operation.rs

File renamed without changes.

src/backends/plonky2/mock_main/statement.rs renamed to src/backends/plonky2/mock/mainpod/statement.rs

File renamed without changes.

‎src/backends/plonky2/mock/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
pub mod mainpod;
2+
pub mod signedpod;

src/backends/plonky2/mock_signed.rs renamed to src/backends/plonky2/mock/signedpod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use anyhow::Result;
22
use std::any::Any;
33
use std::collections::HashMap;
44

5-
use super::primitives::merkletree::MerkleTree;
5+
use crate::backends::plonky2::primitives::merkletree::MerkleTree;
66
use crate::constants::MAX_DEPTH;
77
use crate::middleware::{
88
containers::Dictionary, hash_str, AnchoredKey, Hash, Params, Pod, PodId, PodSigner, PodType,

‎src/backends/plonky2/mod.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
pub mod basetypes;
2-
pub mod common;
3-
pub mod main;
4-
pub mod mock_main;
5-
pub mod mock_signed;
2+
pub mod circuits;
3+
pub mod mock;
64
pub mod primitives;

‎src/backends/plonky2/primitives/merkletree_circuit.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ use plonky2::{
2323
};
2424
use std::iter;
2525

26-
use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
27-
use crate::backends::plonky2::common::{
28-
CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
29-
};
26+
use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F};
27+
use crate::backends::plonky2::circuits::common::{CircuitBuilderPod, ValueTarget};
3028
use crate::backends::plonky2::primitives::merkletree::MerkleProof;
3129

3230
/// `MerkleProofGate` allows to verify both proofs of existence and proofs

0 commit comments

Comments
 (0)