Skip to content

Commit dbba490

Browse files
committed
Fixed warnings
1 parent 580eb11 commit dbba490

File tree

11 files changed

+18
-31
lines changed

11 files changed

+18
-31
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ mina-p2p-messages = { path = "mina-p2p-messages" }
5151
poseidon = { path = "poseidon" }
5252

5353
# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina", features = [ "32x9" ] }
54-
mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
55-
mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
56-
mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
5754
kimchi = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
5855
kimchi-stubs = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
56+
mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
57+
mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
5958
mina-poseidon = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
59+
mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
6060
o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
6161
poly-commitment = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
6262

core/src/network.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ impl NetworkConfig {
111111
pub mod devnet {
112112
use super::{CircuitsConfig, NetworkId};
113113
use crate::constants::{ConstraintConstants, ForkConstants};
114-
use mina_curves::pasta::Fp;
115114

116115
pub const NETWORK_ID: NetworkId = NetworkId::TESTNET;
117116
pub const NAME: &str = "devnet";
@@ -190,7 +189,6 @@ pub mod devnet {
190189
pub mod mainnet {
191190
use super::{CircuitsConfig, NetworkId};
192191
use crate::constants::{ConstraintConstants, ForkConstants};
193-
use mina_curves::pasta::Fp;
194192

195193
pub const NETWORK_ID: NetworkId = NetworkId::MAINNET;
196194
pub const NAME: &str = "mainnet";

ledger/src/proofs/caching.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ use poly_commitment::{
2828
};
2929
use serde::{Deserialize, Serialize};
3030

31-
use crate::proofs::field::FieldWitness;
32-
3331
use super::VerifierIndex;
3432

3533
fn into<'a, U, T>(slice: &'a [U]) -> Vec<T>

ledger/src/proofs/field.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use ark_ec::{short_weierstrass::Projective, AffineRepr, CurveGroup};
2-
use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, FftField, Field, PrimeField};
2+
use ark_ff::{BigInteger256, FftField, Field, PrimeField};
33
use kimchi::curve::KimchiCurve;
44
use mina_curves::pasta::{
55
fields::fft::FpParameters as _, Fp, Fq, PallasParameters, ProjectivePallas, ProjectiveVesta,

ledger/src/proofs/public_input/plonk_checks.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ mod scalars {
495495
proof::PointEvaluations,
496496
};
497497

498-
use crate::proofs::{field::field::sub, transaction::endos};
498+
use crate::proofs::transaction::endos;
499499

500500
use super::*;
501501

@@ -754,11 +754,11 @@ mod scalars {
754754
let x = sub_eval(x, ctx);
755755
field::mul(x, y, ctx.w)
756756
}
757-
Operations::Sub(operations, operations1) => todo!(),
758-
Operations::Double(operations) => todo!(),
759-
Operations::Square(operations) => todo!(),
760-
Operations::Cache(cache_id, operations) => todo!(),
761-
Operations::IfFeature(feature_flag, operations, operations1) => todo!(),
757+
Operations::Sub(_, _) => todo!(),
758+
Operations::Double(_) => todo!(),
759+
Operations::Square(_) => todo!(),
760+
Operations::Cache(_, _) => todo!(),
761+
Operations::IfFeature(_, _, _) => todo!(),
762762
}
763763
}
764764

ledger/src/proofs/transaction.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use kimchi::{
88
groupmap::GroupMap,
99
proof::RecursionChallenge,
1010
};
11-
use kimchi_stubs::lagrange_basis::WithLagrangeBasis;
1211
use mina_curves::pasta::{Fp, Fq};
1312
use mina_p2p_messages::v2::{
1413
self, ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1,
@@ -25,7 +24,6 @@ use mina_p2p_messages::v2::{
2524
};
2625
use mina_poseidon::constants::PlonkSpongeConstantsKimchi;
2726
use mina_signer::{CompressedPubKey, PubKey};
28-
use rand::rngs::StdRng;
2927

3028
use crate::{
3129
decompress_pk, gen_keypair,
@@ -1263,13 +1261,9 @@ impl<F: FieldWitness> InnerCurve<F> {
12631261
where
12641262
S: Into<BigInteger256>,
12651263
{
1266-
use std::ops::Mul;
12671264
let scale: BigInteger256 = scale.into();
1268-
let scale = scale.0;
1269-
// Self {
1270-
// inner: self.inner.mul(scale),
1271-
// }
1272-
todo!()
1265+
let inner = self.inner.mul_bigint(scale);
1266+
Self { inner }
12731267
}
12741268

12751269
fn add_fast(&self, other: Self, w: &mut Witness<F>) -> Self {

ledger/src/proofs/urs_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/// Copy-pasted from https://github.com/MinaProtocol/mina/blob/cf2a732ae39f4e784707e1fc32832da805bb7d09/src/lib/crypto/kimchi_bindings/stubs/src/urs_utils.rs
22
use ark_ec::{AffineRepr, CurveGroup, VariableBaseMSM};
3-
use ark_ff::{batch_inversion, One, PrimeField, UniformRand, Zero};
3+
use ark_ff::{batch_inversion, One, UniformRand, Zero};
44
use poly_commitment::{
55
commitment::{b_poly_coefficients, CommitmentCurve},
66
ipa::SRS,

ledger/src/proofs/verifiers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ fn make_verifier_index(index: VerifierIndex<Fq>) -> VerifierIndex<Fq> {
337337

338338
// <https://github.com/o1-labs/proof-systems/blob/2702b09063c7a48131173d78b6cf9408674fd67e/kimchi/src/verifier_index.rs#L310-L314>
339339
let srs = {
340-
let mut srs = SRS::create(max_poly_size);
340+
let srs = SRS::create(max_poly_size);
341341
srs.with_lagrange_basis(domain);
342342
Arc::new(srs)
343343
};

ledger/src/proofs/wrap.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
use std::{borrow::Cow, ops::Neg, rc::Rc};
22

33
use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, One, Zero};
4-
use ark_poly::{
5-
univariate::DensePolynomial, DenseUVPolynomial, EvaluationDomain, Radix2EvaluationDomain,
6-
};
4+
use ark_poly::{univariate::DensePolynomial, DenseUVPolynomial, EvaluationDomain};
75
use kimchi::{
86
circuits::{expr::RowOffset, scalars::RandomOracles, wires::COLUMNS},
97
oracles::OraclesResult,
108
proof::{PointEvaluations, ProofEvaluations, RecursionChallenge},
119
};
12-
use kimchi_stubs::WithLagrangeBasis;
1310
use mina_curves::pasta::{Fp, Fq, Pallas, Vesta};
1411
use mina_p2p_messages::v2::{
1512
CompositionTypesBranchDataDomainLog2StableV1, CompositionTypesBranchDataStableV1,
@@ -1879,7 +1876,7 @@ pub mod wrap_verifier {
18791876
let actual_shift = { OPS_BITS_PER_CHUNK * chunks_needed(input_length) };
18801877
let pow2pow = |x: InnerCurve<Fq>, n: usize| (0..n).fold(x, |acc, _| acc.clone() + acc);
18811878

1882-
let mut base_and_correction = |h: Domain| {
1879+
let base_and_correction = |h: Domain| {
18831880
let d = 2u64.pow(h.log2_size() as u32);
18841881
match lagrange_commitment::<Fq>(srs, d, i).chunks.as_slice() {
18851882
&[g] => {

ledger/src/scan_state/currency.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::cmp::Ordering::{Equal, Greater, Less};
22

3-
use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Field};
3+
use ark_ff::{BigInteger256, Field};
44
use mina_p2p_messages::v2::BlockTimeTimeStableV1;
55
use rand::Rng;
66

0 commit comments

Comments
 (0)