Address suggestions from @CPerezz

privacy-scaling-explorations · Jun 19, 2023 · 957f6bd · 957f6bd
1 parent 93dddd2
commit 957f6bd
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/integration-tests/src/integration_test_circuits.rs b/integration-tests/src/integration_test_circuits.rs
@@ -32,16 +32,16 @@ use zkevm_circuits::{
     exp_circuit::TestExpCircuit,
     keccak_circuit::TestKeccakCircuit,
     pi_circuit::TestPiCircuit,
-    root_circuit::{compile, Config, EvmTranscript, NativeLoader, RootCircuit, Shplonk},
+    root_circuit::{
+        compile, Config, EvmTranscript, NativeLoader, PoseidonTranscript, RootCircuit, Shplonk,
+    },
     state_circuit::TestStateCircuit,
     super_circuit::SuperCircuit,
     tx_circuit::TestTxCircuit,
     util::SubCircuit,
     witness::{block_convert, Block},
 };
 
-type As<M> = Shplonk<M>;
-
 /// TEST_MOCK_RANDOMNESS
 const TEST_MOCK_RANDOMNESS: u64 = 0x100;
 
@@ -305,7 +305,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
                         instance.iter().map(|instance| instance.len()).collect(),
                     ),
                 );
-                let circuit = RootCircuit::<Bn256, As<_>>::new(
+                let circuit = RootCircuit::<Bn256, Shplonk<_>>::new(
                     &params,
                     &protocol,
                     Value::unknown(),
@@ -421,7 +421,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
             };
 
             log::info!("root circuit new");
-            let root_circuit = RootCircuit::<Bn256, As<_>>::new(
+            let root_circuit = RootCircuit::<Bn256, Shplonk<_>>::new(
                 &params,
                 &protocol,
                 Value::known(&instance),
@@ -460,8 +460,6 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
     }
 }
 
-use zkevm_circuits::root_circuit::PoseidonTranscript;
-
 fn new_empty_block() -> Block<Fr> {
     let block: GethData = TestContext::<0, 0>::new(None, |_| {}, |_, _| {}, |b, _| b)
         .unwrap()