refactor

AztecProtocol · Nov 20, 2024 · 9d00674 · 9d00674
1 parent 0108e72
commit 9d00674
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/...s/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr b/...s/noir-protocol-circuits/crates/rollup-lib/src/abis/base_or_merge_rollup_public_inputs.nr
@@ -6,8 +6,8 @@ use dep::types::{
     utils::reader::Reader,
 };
 
-global BASE_ROLLUP_TYPE = 0;
-global MERGE_ROLLUP_TYPE = 1;
+pub(crate) global BASE_ROLLUP_TYPE = 0;
+pub(crate) global MERGE_ROLLUP_TYPE = 1;
 
 pub struct BaseOrMergeRollupPublicInputs {
     // rollup_type is either 0 (base) or 1 (merge)

diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/public_base_rollup.nr
@@ -17,9 +17,8 @@ use dep::types::{
     abis::{
         accumulated_data::CombinedAccumulatedData,
         append_only_tree_snapshot::AppendOnlyTreeSnapshot,
-        avm::AvmProofData,
+        avm_circuit_public_inputs::AvmProofData,
         combined_constant_data::CombinedConstantData,
-        kernel_circuit_public_inputs::KernelCircuitPublicInputs,
         log_hash::{LogHash, ScopedLogHash},
         nullifier_leaf_preimage::NullifierLeafPreimage,
         public_data_write::PublicDataWrite,

diff --git a/...col-circuits/crates/types/src/abis/avm.nr → ...pes/src/abis/avm_circuit_public_inputs.nr b/...col-circuits/crates/types/src/abis/avm.nr → ...pes/src/abis/avm_circuit_public_inputs.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/mod.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/mod.nr
@@ -1,5 +1,5 @@
 pub mod append_only_tree_snapshot;
-pub mod avm;
+pub mod avm_circuit_public_inputs;
 
 pub mod contract_class_function_leaf_preimage;
 

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/abis/tube.nr b/noir-projects/noir-protocol-circuits/crates/types/src/abis/tube.nr
@@ -7,9 +7,9 @@ use crate::{
 };
 
 pub struct PublicTubeData {
-    public_inputs: PrivateToPublicKernelCircuitPublicInputs,
-    proof: TubeProof,
-    vk_data: VkData<HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS>,
+    pub public_inputs: PrivateToPublicKernelCircuitPublicInputs,
+    pub proof: TubeProof,
+    pub vk_data: VkData<HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS>,
 }
 
 impl Verifiable for PublicTubeData {

diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr b/noir-projects/noir-protocol-circuits/crates/types/src/tests/fixture_builder.nr
@@ -4,7 +4,7 @@ use crate::{
             avm_accumulated_data::AvmAccumulatedData, CombinedAccumulatedData,
             PrivateAccumulatedData, PrivateAccumulatedDataBuilder, PrivateToPublicAccumulatedData,
         },
-        avm::AvmProofData,
+        avm_circuit_public_inputs::AvmProofData,
         call_context::CallContext,
         combined_constant_data::CombinedConstantData,
         function_data::FunctionData,