11use sp1_core_machine:: io:: SP1Stdin ;
2- use sp1_prover:: { components:: CpuProverComponents , SP1Prover , SP1ProvingKey , SP1VerifyingKey } ;
2+ use sp1_prover:: { components:: CpuProverComponents , SP1ProvingKey , SP1VerifyingKey } ;
33use sp1_sdk:: { CpuProver , EnvProver , Prover , SP1ProofMode , SP1ProofWithPublicValues } ;
44
55pub trait CharmsSP1Prover : Send + Sync {
6- fn inner ( & self ) -> & SP1Prover < CpuProverComponents > ;
76 fn setup ( & self , elf : & [ u8 ] ) -> ( SP1ProvingKey , SP1VerifyingKey ) ;
87 fn prove (
98 & self ,
@@ -14,10 +13,6 @@ pub trait CharmsSP1Prover: Send + Sync {
1413}
1514
1615impl CharmsSP1Prover for CpuProver {
17- fn inner ( & self ) -> & SP1Prover < CpuProverComponents > {
18- <Self as Prover < CpuProverComponents > >:: inner ( self )
19- }
20-
2116 fn setup ( & self , elf : & [ u8 ] ) -> ( SP1ProvingKey , SP1VerifyingKey ) {
2217 let ( pk, _, _, vk) = <Self as Prover < CpuProverComponents > >:: inner ( self ) . setup ( elf) ;
2318 ( pk, vk)
@@ -35,10 +30,6 @@ impl CharmsSP1Prover for CpuProver {
3530}
3631
3732impl CharmsSP1Prover for EnvProver {
38- fn inner ( & self ) -> & SP1Prover < CpuProverComponents > {
39- <Self as Prover < CpuProverComponents > >:: inner ( self )
40- }
41-
4233 fn setup ( & self , elf : & [ u8 ] ) -> ( SP1ProvingKey , SP1VerifyingKey ) {
4334 let ( pk, _, _, vk) = <Self as Prover < CpuProverComponents > >:: inner ( self ) . setup ( elf) ;
4435 ( pk, vk)
0 commit comments