diff --git a/basic/Cargo.toml b/basic/Cargo.toml index affba602..9cdd34e6 100644 --- a/basic/Cargo.toml +++ b/basic/Cargo.toml @@ -41,7 +41,6 @@ p3-dft = { path = "../../Plonky3/dft" } p3-field = { path = "../../Plonky3/field" } p3-fri = { path = "../../Plonky3/fri" } p3-keccak = { path = "../../Plonky3/keccak" } -p3-ldt = { path = "../../Plonky3/ldt" } p3-mds = { path = "../../Plonky3/mds" } p3-merkle-tree = { path = "../../Plonky3/merkle-tree" } p3-poseidon = { path = "../../Plonky3/poseidon" } diff --git a/basic/tests/test_prover.rs b/basic/tests/test_prover.rs index 78a04f64..cee3b6a2 100644 --- a/basic/tests/test_prover.rs +++ b/basic/tests/test_prover.rs @@ -1,13 +1,13 @@ extern crate core; use p3_baby_bear::BabyBear; +use p3_fri::{TwoAdicFriPcs, TwoAdicFriPcsConfig}; use valida_alu_u32::add::{Add32Instruction, MachineWithAdd32Chip}; use valida_basic::BasicMachine; use valida_cpu::{ BeqInstruction, BneInstruction, Imm32Instruction, JalInstruction, JalvInstruction, MachineWithCpuChip, StopInstruction, }; - use valida_machine::{ FixedAdviceProvider, Instruction, InstructionWord, Machine, MachineProof, Operands, ProgramROM, Word, @@ -21,9 +21,8 @@ use p3_challenger::DuplexChallenger; use p3_dft::Radix2Bowers; use p3_field::extension::BinomialExtensionField; use p3_field::Field; -use p3_fri::{FriBasedPcs, FriConfigImpl, FriLdt}; +use p3_fri::FriConfig; use p3_keccak::Keccak256Hash; -use p3_ldt::QuotientMmcs; use p3_mds::coset_mds::CosetMds; use p3_merkle_tree::FieldMerkleTreeMmcs; use p3_poseidon::Poseidon; @@ -221,15 +220,18 @@ fn prove_fibonacci() { type Challenger = DuplexChallenger; - type Quotient = QuotientMmcs; - type MyFriConfig = FriConfigImpl; - let fri_config = MyFriConfig::new(1, 40, 8, challenge_mmcs); - let ldt = FriLdt { config: fri_config }; + type MyFriConfig = TwoAdicFriPcsConfig; + let fri_config = FriConfig { + log_blowup: 1, + num_queries: 40, + proof_of_work_bits: 8, + mmcs: challenge_mmcs, + }; - type Pcs = FriBasedPcs; + type Pcs = TwoAdicFriPcs; type MyConfig = StarkConfigImpl; - let pcs = Pcs::new(dft, val_mmcs, ldt); + let pcs = Pcs::new(fri_config, dft, val_mmcs); let challenger = Challenger::new(perm16); let config = MyConfig::new(pcs, challenger);