organize files & dirs (mostly backend structure)

Author: arnaucube

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

@@ -1,13 +1,3 @@
-use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
-use crate::backends::plonky2::common::{
-    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
-};
-use crate::backends::plonky2::primitives::merkletree::MerkleProofExistenceCircuit;
-use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
-use crate::middleware::{
-    hash_str, AnchoredKey, NativeOperation, NativePredicate, Operation, Params, PodType, Predicate,
-    Statement, StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
-};
 use anyhow::Result;
 use itertools::Itertools;
 use plonky2::{
@@ -24,6 +14,17 @@ use plonky2::{
 };
 use std::collections::HashMap;
 
+use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
+use crate::backends::plonky2::circuits::common::{
+    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
+};
+use crate::backends::plonky2::primitives::merkletree::MerkleProofExistenceCircuit;
+use crate::backends::plonky2::primitives::merkletree::{MerkleProof, MerkleTree};
+use crate::middleware::{
+    hash_str, AnchoredKey, NativeOperation, NativePredicate, Operation, Params, PodType, Predicate,
+    Statement, StatementArg, ToFields, KEY_TYPE, SELF, STATEMENT_ARG_F_LEN,
+};
+
 /// MerkleTree Max Depth
 const MD: usize = 32;
 

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

@@ -0,0 +1,2 @@
+pub mod common;
+pub mod mainpod;

src/backends/plonky2/circuits/mod.rs

@@ -505,7 +505,7 @@ impl Pod for MockMainPod {
 #[cfg(test)]
 pub mod tests {
     use super::*;
-    use crate::backends::plonky2::mock_signed::MockSigner;
+    use crate::backends::plonky2::mock::signedpod::MockSigner;
     use crate::examples::{
         great_boy_pod_full_flow, tickets_pod_full_flow, zu_kyc_pod_builder,
         zu_kyc_sign_pod_builders,

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

@@ -0,0 +1,2 @@
+pub mod mainpod;
+pub mod signedpod;

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

@@ -2,7 +2,7 @@ use anyhow::Result;
 use std::any::Any;
 use std::collections::HashMap;
 
-use super::primitives::merkletree::MerkleTree;
+use crate::backends::plonky2::primitives::merkletree::MerkleTree;
 use crate::constants::MAX_DEPTH;
 use crate::middleware::{
     containers::Dictionary, hash_str, AnchoredKey, Hash, Params, Pod, PodId, PodSigner, PodType,

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

@@ -1,6 +1,4 @@
 pub mod basetypes;
-pub mod common;
-pub mod main;
-pub mod mock_main;
-pub mod mock_signed;
+pub mod circuits;
+pub mod mock;
 pub mod primitives;

src/backends/plonky2/mock/mod.rs

@@ -23,10 +23,8 @@ use plonky2::{
 };
 use std::iter;
 
-use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F, VALUE_SIZE};
-use crate::backends::plonky2::common::{
-    CircuitBuilderPod, OperationTarget, StatementTarget, ValueTarget,
-};
+use crate::backends::plonky2::basetypes::{Hash, Value, D, EMPTY_HASH, EMPTY_VALUE, F};
+use crate::backends::plonky2::circuits::common::{CircuitBuilderPod, ValueTarget};
 use crate::backends::plonky2::primitives::merkletree::MerkleProof;
 
 /// `MerkleProofCircuit` allows to verify both proofs of existence and proofs