github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: Clippy lints

Browse Source
This commit is contained in:
parazyd
2024-03-27 15:19:04 +01:00
parent ce35921cab
commit b0df9d5f38
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zk/debug.rs
View File

@@ -132,15 +132,15 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
let jval_as_fp = |j_val: &JsonValue| {
let valstr: &String = j_val.get().expect("value str");
pallas::Base::from_str(&valstr).unwrap()
pallas::Base::from_str(valstr).unwrap()
};
let jval_as_vecfp = |j_val: &JsonValue| {
j_val
.get::<Vec<_>>()
.expect("value str")
.into_iter()
.map(|v| jval_as_fp(v))
.iter()
.map(jval_as_fp)
.collect::<Vec<pallas::Base>>()
};
@@ -156,7 +156,7 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
}
"Scalar" => {
let valstr: &String = j_val.get().expect("value str");
let fq = pallas::Scalar::from_str(&valstr).unwrap();
let fq = pallas::Scalar::from_str(valstr).unwrap();
witnesses.push(Witness::Scalar(Value::known(fq)));
}
"Uint32" => {
@@ -164,8 +164,7 @@ pub fn import_witness_json<P: AsRef<Path>>(input_path: P) -> (Vec<Witness>, Vec<
witnesses.push(Witness::Uint32(Value::known(*val as u32)));
}
"MerklePath" => {
let vals: Vec<_> =
jval_as_vecfp(j_val).into_iter().map(|v| MerkleNode::new(v)).collect();
let vals: Vec<_> = jval_as_vecfp(j_val).into_iter().map(MerkleNode::new).collect();
assert_eq!(vals.len(), 32);
let vals: [MerkleNode; 32] = vals.try_into().unwrap();
witnesses.push(Witness::MerklePath(Value::known(vals)));

5
src/zk/vm.rs
View File

@@ -574,8 +574,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
SinsemillaChip::load(sinsemilla_cfg1.clone(), &mut layouter)?;
}
let no_sinsemilla_chip =
config.chips.iter().find(|&c| matches!(c, VmChip::Sinsemilla(_))).is_none();
let no_sinsemilla_chip = !config.chips.iter().any(|c| matches!(c, VmChip::Sinsemilla(_)));
// Construct the 64-bit NativeRangeCheck chip
let rangecheck64_chip = config.rangecheck64_chip();
@@ -592,7 +591,7 @@ impl Circuit<pallas::Base> for ZkCircuit {
}
let no_rangecheck64_chip =
config.chips.iter().find(|&c| matches!(c, VmChip::NativeRange64(_))).is_none();
!config.chips.iter().any(|c| matches!(c, VmChip::NativeRange64(_)));
// Construct the 253-bit NativeRangeCheck and LessThan chips.
let rangecheck253_chip = config.rangecheck253_chip();