Skip to content

Commit f1401e2

Browse files
robknightrobknight
committed
Formatting
1 parent cfb7690 commit f1401e2

File tree

13 files changed

+59
-62
lines changed

13 files changed

+59
-62
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use anyhow::{anyhow, Result};
2+
use base64::prelude::*;
23
use itertools::Itertools;
34
use plonky2::hash::poseidon::PoseidonHash;
45
use plonky2::plonk::config::Hasher;
6+
use serde::{Deserialize, Serialize};
57
use std::any::Any;
68
use std::fmt;
7-
use serde::{Deserialize, Serialize};
8-
use base64::prelude::*;
99

1010
use crate::middleware::{
1111
self, hash_str, AnchoredKey, Hash, MainPodInputs, NativeOperation, NativePredicate, NonePod,
@@ -32,10 +32,10 @@ impl PodProver for MockProver {
3232
pub struct MockMainPod {
3333
params: Params,
3434
id: PodId,
35-
// input_signed_pods: Vec<Box<dyn Pod>>,
36-
// input_main_pods: Vec<Box<dyn Pod>>,
35+
// input_signed_pods: Vec<Box<dyn Pod>>,
36+
// input_main_pods: Vec<Box<dyn Pod>>,
3737
// New statements introduced by this pod
38-
// input_statements: Vec<Statement>,
38+
// input_statements: Vec<Statement>,
3939
public_statements: Vec<Statement>,
4040
operations: Vec<Operation>,
4141
// All statements (inherited + new)
@@ -333,9 +333,9 @@ impl MockMainPod {
333333
Ok(Self {
334334
params: params.clone(),
335335
id,
336-
// input_signed_pods,
337-
// input_main_pods,
338-
// input_statements,
336+
// input_signed_pods,
337+
// input_main_pods,
338+
// input_statements,
339339
public_statements,
340340
statements,
341341
operations,

‎src/backends/plonky2/mock_main/operation.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use anyhow::Result;
2-
use std::fmt;
3-
use serde::{Deserialize, Serialize};
41
use super::Statement;
52
use crate::middleware::{self, OperationType};
3+
use anyhow::Result;
4+
use serde::{Deserialize, Serialize};
5+
use std::fmt;
66

77
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
88
pub enum OperationArg {

‎src/backends/plonky2/mock_main/statement.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use anyhow::{anyhow, Result};
2-
use std::fmt;
32
use serde::{Deserialize, Serialize};
3+
use std::fmt;
44

55
use crate::middleware::{
66
self, AnchoredKey, NativePredicate, Params, Predicate, StatementArg, ToFields,

‎src/backends/plonky2/mock_signed.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ pub struct MockSignedPod {
4646

4747
impl MockSignedPod {
4848
pub fn new(id: PodId, signature: String, dict: Dictionary) -> Self {
49-
Self { id, signature, dict }
49+
Self {
50+
id,
51+
signature,
52+
dict,
53+
}
5054
}
5155
}
5256

‎src/examples.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use std::collections::HashMap;
66

77
use crate::backends::plonky2::mock_signed::MockSigner;
88
use crate::frontend::{
9-
MainPodBuilder, Operation, OperationArg, SignedPod, SignedPodBuilder, Statement, Value,
109
containers::{Dictionary, Set},
10+
MainPodBuilder, Operation, OperationArg, SignedPod, SignedPodBuilder, Statement, Value,
1111
};
12-
use crate::middleware::{Params, PodType, KEY_SIGNER, KEY_TYPE};
1312
use crate::middleware::{CustomPredicateRef, NativeOperation, OperationType};
13+
use crate::middleware::{Params, PodType, KEY_SIGNER, KEY_TYPE};
1414
use crate::op;
1515

1616
// ZuKYC
@@ -32,7 +32,7 @@ pub fn zu_kyc_sign_pod_builders(
3232

3333
sanction_list.insert(
3434
"sanctionList",
35-
Value::Set(Set::new(sanctions_values.into()))
35+
Value::Set(Set::new(sanctions_values.into())),
3636
);
3737

3838
(gov_id, pay_stub, sanction_list)

‎src/frontend/containers.rs‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,22 @@ use crate::middleware::{
1212

1313
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
1414
#[serde(transparent)]
15-
pub struct Set(
16-
Vec<Value>,
17-
#[serde(skip)]
18-
MiddlewareSet,
19-
);
15+
pub struct Set(Vec<Value>, #[serde(skip)] MiddlewareSet);
2016

2117
impl Set {
22-
pub fn new(values: Vec<Value>) -> Self {
23-
let set = MiddlewareSet::new(&values.iter().map(|v| MiddlewareValue::from(v)).collect()).unwrap();
24-
Self(values, set)
25-
}
26-
27-
pub fn middleware_set(&self) -> &MiddlewareSet {
28-
&self.1
29-
}
30-
31-
pub fn values(&self) -> &Vec<Value> {
32-
&self.0
33-
}
18+
pub fn new(values: Vec<Value>) -> Self {
19+
let set =
20+
MiddlewareSet::new(&values.iter().map(|v| MiddlewareValue::from(v)).collect()).unwrap();
21+
Self(values, set)
22+
}
23+
24+
pub fn middleware_set(&self) -> &MiddlewareSet {
25+
&self.1
26+
}
27+
28+
pub fn values(&self) -> &Vec<Value> {
29+
&self.0
30+
}
3431
}
3532

3633
impl<'de> Deserialize<'de> for Set {
@@ -45,11 +42,7 @@ impl<'de> Deserialize<'de> for Set {
4542

4643
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
4744
#[serde(transparent)]
48-
pub struct Dictionary(
49-
HashMap<String, Value>,
50-
#[serde(skip)]
51-
MiddlewareDictionary
52-
);
45+
pub struct Dictionary(HashMap<String, Value>, #[serde(skip)] MiddlewareDictionary);
5346

5447
impl Dictionary {
5548
pub fn new(values: HashMap<String, Value>) -> Self {
@@ -84,10 +77,7 @@ impl<'de> Deserialize<'de> for Dictionary {
8477

8578
#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
8679
#[serde(transparent)]
87-
pub struct Array(
88-
Vec<Value>,
89-
#[serde(skip)]
90-
MiddlewareArray);
80+
pub struct Array(Vec<Value>, #[serde(skip)] MiddlewareArray);
9181

9282
impl Array {
9383
pub fn new(values: Vec<Value>) -> Self {

‎src/frontend/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
//! with Pods.
33
44
use crate::frontend::serialization::*;
5+
use crate::middleware::{
6+
self, hash_str, Hash, MainPodInputs, NativeOperation, NativePredicate, Params, PodId,
7+
PodProver, PodSigner, SELF,
8+
};
9+
use crate::middleware::{OperationType, Predicate, KEY_SIGNER, KEY_TYPE};
510
use anyhow::{anyhow, Error, Result};
611
use containers::{Array, Dictionary, Set};
712
use itertools::Itertools;
813
use serde::{Deserialize, Serialize};
914
use std::collections::HashMap;
1015
use std::convert::From;
1116
use std::{fmt, hash as h};
12-
use crate::middleware::{
13-
self, hash_str, Hash, MainPodInputs, NativeOperation, NativePredicate, Params, PodId,
14-
PodProver, PodSigner, SELF,
15-
};
16-
use crate::middleware::{OperationType, Predicate, KEY_SIGNER, KEY_TYPE};
1717

1818
pub mod containers;
1919
mod custom;

‎src/frontend/serialization.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use crate::backends::plonky2::mock_main::MockMainPod;
88
use crate::backends::plonky2::mock_signed::MockSignedPod;
99
use crate::frontend::containers::Dictionary;
1010
use crate::frontend::Statement;
11-
use crate::middleware::{HASH_SIZE, VALUE_SIZE};
1211
use crate::middleware::{PodId, F};
12+
use crate::middleware::{HASH_SIZE, VALUE_SIZE};
1313
use plonky2::field::types::Field;
1414

1515
use super::Value;
@@ -80,7 +80,7 @@ impl Serialize for MainPod {
8080
state.serialize_field("pod_class", "Main")?;
8181
state.serialize_field("pod_type", "Mock")?;
8282
state.end()
83-
}
83+
}
8484
}
8585

8686
impl<'de> Deserialize<'de> for MainPod {
@@ -94,7 +94,7 @@ impl<'de> Deserialize<'de> for MainPod {
9494
proof: String,
9595
pod_class: String,
9696
pod_type: String,
97-
}
97+
}
9898

9999
let helper = MainPodHelper::deserialize(deserializer)?;
100100
if helper.pod_class != "Main" {
@@ -129,7 +129,10 @@ where
129129
.map_err(serde::de::Error::custom)
130130
}
131131

132-
fn serialize_field_tuple<S, const N: usize>(value: &[F; N], serializer: S) -> Result<S::Ok, S::Error>
132+
fn serialize_field_tuple<S, const N: usize>(
133+
value: &[F; N],
134+
serializer: S,
135+
) -> Result<S::Ok, S::Error>
133136
where
134137
S: serde::Serializer,
135138
{
@@ -150,7 +153,7 @@ where
150153
let end = start + 16;
151154
let hex_part = &hex_str[start..end];
152155
v[i] = F::from_canonical_u64(
153-
u64::from_str_radix(hex_part, 16).map_err(serde::de::Error::custom)?
156+
u64::from_str_radix(hex_part, 16).map_err(serde::de::Error::custom)?,
154157
);
155158
}
156159
Ok(v)

‎src/frontend/statement.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use anyhow::{anyhow, Result};
2-
use std::fmt;
3-
use serde::{Deserialize, Serialize};
41
use super::{AnchoredKey, SignedPod, Value};
52
use crate::middleware::{self, NativePredicate, Predicate};
3+
use anyhow::{anyhow, Result};
4+
use serde::{Deserialize, Serialize};
5+
use std::fmt;
66

77
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
88
pub enum StatementArg {

‎src/middleware/custom.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use std::{fmt, hash as h, iter::zip};
55
use anyhow::{anyhow, Result};
66
use plonky2::field::types::Field;
77

8-
use crate::backends::plonky2::basetypes::HASH_SIZE;
9-
use crate::util::hashmap_insert_no_dupe;
10-
use serde::{Deserialize, Serialize};
118
use super::{
129
hash_fields, AnchoredKey, Hash, NativePredicate, Params, PodId, Statement, StatementArg,
1310
ToFields, Value, F,
1411
};
12+
use crate::backends::plonky2::basetypes::HASH_SIZE;
13+
use crate::util::hashmap_insert_no_dupe;
14+
use serde::{Deserialize, Serialize};
1515

1616
// BEGIN Custom 1b
1717

0 commit comments

Comments
 (0)