Run make format

dannywillems · dannywillems · commit a16a702c2627 · 2025-07-25T23:12:05.000+02:00
diff --git a/ledger/src/cache.rs b/ledger/src/cache.rs
@@ -78,8 +78,7 @@ mod tests {
 
     #[test]
     fn test_cache() {
-        use mina_curves::pasta::Fq;
-        use mina_curves::pasta::Fp;
+        use mina_curves::pasta::{Fp, Fq};
 
         static COUNTER: AtomicUsize = AtomicUsize::new(0);
 
diff --git a/ledger/src/proofs/accumulator_check.rs b/ledger/src/proofs/accumulator_check.rs
@@ -1,6 +1,5 @@
 use ark_ff::fields::arithmetic::InvalidBigInt;
-use mina_curves::pasta::Vesta;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Vesta};
 use mina_p2p_messages::{bigint::BigInt, v2::PicklesProofProofsVerified2ReprStableV2};
 use poly_commitment::{commitment::CommitmentCurve, srs::SRS};
 
diff --git a/ledger/src/proofs/block.rs b/ledger/src/proofs/block.rs
@@ -3,8 +3,7 @@ use std::{rc::Rc, sync::Arc};
 use anyhow::Context;
 use ark_ff::fields::arithmetic::InvalidBigInt;
 use consensus::ConsensusState;
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2;
 use openmina_core::constants::{constraint_constants, ForkConstants};
 use poseidon::hash::{
diff --git a/ledger/src/proofs/constants.rs b/ledger/src/proofs/constants.rs
@@ -1,6 +1,5 @@
 use ark_ff::{One, Zero};
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 
 use super::{
     field::Boolean,
diff --git a/ledger/src/proofs/field.rs b/ledger/src/proofs/field.rs
@@ -7,9 +7,8 @@ use ark_ff::{
 };
 use kimchi::curve::KimchiCurve;
 use mina_curves::pasta::{
-    Fq, PallasParameters, ProjectivePallas, ProjectiveVesta, VestaParameters,
+    Fp, Fq, PallasParameters, ProjectivePallas, ProjectiveVesta, VestaParameters,
 };
-use mina_curves::pasta::Fp;
 use mina_poseidon::{constants::PlonkSpongeConstantsKimchi, sponge::DefaultFqSponge};
 
 use poseidon::SpongeParamsForField;
diff --git a/ledger/src/proofs/merge.rs b/ledger/src/proofs/merge.rs
@@ -7,8 +7,7 @@ use crate::proofs::{
     wrap::{wrap, WrapParams},
 };
 use ark_ff::fields::arithmetic::InvalidBigInt;
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2;
 
 use crate::{
diff --git a/ledger/src/proofs/prover.rs b/ledger/src/proofs/prover.rs
@@ -4,8 +4,7 @@ use kimchi::{
     poly_commitment::PolyComm,
     proof::{PointEvaluations, ProofEvaluations, ProverCommitments, RecursionChallenge},
 };
-use mina_curves::pasta::Pallas;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Pallas};
 use once_cell::sync::Lazy;
 use poly_commitment::{commitment::CommitmentCurve, evaluation_proof::OpeningProof};
 
diff --git a/ledger/src/proofs/provers.rs b/ledger/src/proofs/provers.rs
@@ -1,8 +1,7 @@
 use std::{collections::HashMap, path::Path, sync::Arc};
 
 use kimchi::circuits::gate::CircuitGate;
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use once_cell::sync::OnceCell;
 use openmina_core::network::CircuitsConfig;
 
diff --git a/ledger/src/proofs/public_input/messages.rs b/ledger/src/proofs/public_input/messages.rs
@@ -8,8 +8,7 @@ use crate::proofs::{
 };
 use ark_ec::short_weierstrass_jacobian::GroupAffine;
 use ark_ff::{BigInteger256, PrimeField};
-use mina_curves::pasta::{Fq, Pallas};
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq, Pallas};
 use poly_commitment::PolyComm;
 
 use poseidon::hash::hash_fields;
diff --git a/ledger/src/proofs/public_input/plonk_checks.rs b/ledger/src/proofs/public_input/plonk_checks.rs
@@ -7,8 +7,7 @@ use kimchi::{
     curve::KimchiCurve,
     proof::{PointEvaluations, ProofEvaluations},
 };
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 
 use crate::{
     proofs::{
diff --git a/ledger/src/proofs/public_input/prepared_statement.rs b/ledger/src/proofs/public_input/prepared_statement.rs
@@ -1,6 +1,5 @@
 use ark_ff::{BigInteger256, Zero};
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2::{
     CompositionTypesBranchDataStableV1, PicklesBaseProofsVerifiedStableV1,
 };
diff --git a/ledger/src/proofs/public_input/scalar_challenge.rs b/ledger/src/proofs/public_input/scalar_challenge.rs
@@ -111,8 +111,7 @@ mod tests {
 
     use super::*;
 
-    use mina_curves::pasta::Fq;
-    use mina_curves::pasta::Fp;
+    use mina_curves::pasta::{Fp, Fq};
 
     #[cfg(target_family = "wasm")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
diff --git a/ledger/src/proofs/public_input/scalars.rs b/ledger/src/proofs/public_input/scalars.rs
@@ -1,7 +1,6 @@
 use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Field, FromBytes};
 use kimchi::proof::ProofEvaluations;
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 
 use crate::proofs::field::FieldWitness;
 
@@ -688,8 +687,7 @@ mod tests {
         circuits::expr::Linearization,
         linearization::{constraints_expr, linearization_columns},
     };
-    use mina_curves::pasta::Fq;
-    use mina_curves::pasta::Fp;
+    use mina_curves::pasta::{Fp, Fq};
     use sha2::{Digest, Sha256};
     #[cfg(target_family = "wasm")]
     use wasm_bindgen_test::wasm_bindgen_test as test;
diff --git a/ledger/src/proofs/step.rs b/ledger/src/proofs/step.rs
@@ -23,8 +23,7 @@ use ark_poly::{
     univariate::DensePolynomial, EvaluationDomain, Radix2EvaluationDomain, UVPolynomial,
 };
 use kimchi::proof::{PointEvaluations, ProverCommitments, RecursionChallenge};
-use mina_curves::pasta::{Fq, Pallas};
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq, Pallas};
 use mina_p2p_messages::v2;
 use poly_commitment::{commitment::b_poly_coefficients, evaluation_proof::OpeningProof};
 
diff --git a/ledger/src/proofs/to_field_elements.rs b/ledger/src/proofs/to_field_elements.rs
@@ -6,8 +6,7 @@ use crate::{
 };
 use ark_ff::{Field, One, Zero};
 use kimchi::proof::{PointEvaluations, ProofEvaluations, ProverCommitments, ProverProof};
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::{string::ByteString, v2};
 use mina_signer::CompressedPubKey;
 use poly_commitment::evaluation_proof::OpeningProof;
diff --git a/ledger/src/proofs/transaction.rs b/ledger/src/proofs/transaction.rs
@@ -7,8 +7,7 @@ use kimchi::{
     circuits::{gate::CircuitGate, wires::COLUMNS},
     proof::RecursionChallenge,
 };
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2::{
     self, ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1,
     ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, CurrencyAmountStableV1,
diff --git a/ledger/src/proofs/unfinalized.rs b/ledger/src/proofs/unfinalized.rs
@@ -1,7 +1,6 @@
 use ark_ff::fields::arithmetic::InvalidBigInt;
 use kimchi::proof::{PointEvaluations, ProofEvaluations};
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2;
 
 use crate::proofs::{
@@ -25,8 +24,7 @@ use super::{
 
 pub mod ro {
 
-    use mina_curves::pasta::Fq;
-    use mina_curves::pasta::Fp;
+    use mina_curves::pasta::{Fp, Fq};
 
     use crate::proofs::{
         field::FieldWitness, public_input::scalar_challenge::ScalarChallenge,
diff --git a/ledger/src/proofs/verification.rs b/ledger/src/proofs/verification.rs
@@ -40,8 +40,7 @@ use kimchi::{
     mina_curves::pasta::Pallas,
     proof::{PointEvaluations, ProofEvaluations},
 };
-use mina_curves::pasta::{Fq, Vesta};
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq, Vesta};
 use mina_p2p_messages::{
     bigint::BigInt,
     binprot::BinProtWrite,
diff --git a/ledger/src/proofs/verifiers.rs b/ledger/src/proofs/verifiers.rs
@@ -21,8 +21,7 @@ use kimchi::{
     linearization::expr_linearization,
     mina_curves::pasta::Pallas,
 };
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use poly_commitment::srs::SRS;
 
 use crate::{proofs::BACKEND_TOCK_ROUNDS_N, VerificationKey};
diff --git a/ledger/src/proofs/wrap.rs b/ledger/src/proofs/wrap.rs
@@ -7,8 +7,7 @@ use kimchi::{
     oracles::OraclesResult,
     proof::{PointEvaluations, ProofEvaluations, RecursionChallenge},
 };
-use mina_curves::pasta::{Fq, Pallas, Vesta};
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq, Pallas, Vesta};
 use mina_p2p_messages::v2::{
     CompositionTypesBranchDataDomainLog2StableV1, CompositionTypesBranchDataStableV1,
     PicklesBaseProofsVerifiedStableV1,
diff --git a/ledger/src/proofs/zkapp.rs b/ledger/src/proofs/zkapp.rs
@@ -2,8 +2,7 @@ use std::{cell::RefCell, rc::Rc};
 
 use ark_ff::{fields::arithmetic::InvalidBigInt, BigInteger256, Zero};
 use kimchi::proof::PointEvaluations;
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2;
 use poseidon::hash::{
     hash_with_kimchi,
diff --git a/ledger/src/util/mod.rs b/ledger/src/util/mod.rs
@@ -1,8 +1,7 @@
 use std::ops::Neg;
 
 use ark_ff::{BigInteger, PrimeField};
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_signer::{CompressedPubKey, CurvePoint, Keypair, PubKey};
 
 mod backtrace;
diff --git a/ledger/src/verifier/mod.rs b/ledger/src/verifier/mod.rs
@@ -17,8 +17,7 @@ use self::common::CheckResult;
 #[derive(Debug, Clone)]
 pub struct Verifier;
 
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::v2::{
     PicklesProofProofsVerified2ReprStableV2, PicklesProofProofsVerifiedMaxStableV2,
 };
diff --git a/tools/fuzzing/src/transaction_fuzzer/context.rs b/tools/fuzzing/src/transaction_fuzzer/context.rs
@@ -24,8 +24,7 @@ use ledger::{
     transaction_pool::TransactionPool,
     Account, AccountId, Database, Mask, Timing, TokenId,
 };
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::{
     bigint, binprot,
     binprot::SmallString1k,
diff --git a/tools/fuzzing/src/transaction_fuzzer/generator.rs b/tools/fuzzing/src/transaction_fuzzer/generator.rs
@@ -27,8 +27,7 @@ use ledger::{
     Account, AuthRequired, MutableFp, Permissions, ProofVerified, SetVerificationKey, TokenId,
     TokenSymbol, VerificationKey, VerificationKeyWire, VotingFor, ZkAppUri, TXN_VERSION_CURRENT,
 };
-use mina_curves::pasta::Fq;
-use mina_curves::pasta::Fp;
+use mina_curves::pasta::{Fp, Fq};
 use mina_p2p_messages::{
     array::ArrayN,
     list::List,
