fix: use absolute paths in VmConfig derive macro (#1550)

- use absolute paths for structs used only in the derive macro

Author: shuklaayush

.gitignore

@@ -22,6 +22,7 @@ rustc-*
 # Bench metrics
 .bench_metrics/
 __pycache__/
+metrics.json
 
 # KZG trusted setup
 **/params

Cargo.lock

@@ -66,3 +66,6 @@ harness = false
 
 [[bin]]
 name = "fib_e2e"
+
+[package.metadata.cargo-shear]
+ignored = ["derive_more"]

benchmarks/Cargo.toml

@@ -1,5 +1,4 @@
 use clap::Parser;
-use derive_more::derive::From;
 use eyre::Result;
 use k256::ecdsa::{SigningKey, VerifyingKey};
 use num_bigint::BigUint;
@@ -9,12 +8,8 @@ use openvm_algebra_circuit::{
 use openvm_algebra_transpiler::ModularTranspilerExtension;
 use openvm_benchmarks::utils::BenchmarkCli;
 use openvm_circuit::{
-    arch::{
-        instructions::exe::VmExe, SystemConfig, SystemExecutor, SystemPeriphery, VmChipComplex,
-        VmConfig, VmInventoryError,
-    },
-    circuit_derive::{Chip, ChipUsageGetter},
-    derive::{AnyEnum, InstructionExecutor, VmConfig},
+    arch::{instructions::exe::VmExe, SystemConfig},
+    derive::VmConfig,
 };
 use openvm_ecc_circuit::{
     CurveConfig, WeierstrassExtension, WeierstrassExtensionExecutor, WeierstrassExtensionPeriphery,

benchmarks/src/bin/ecrecover.rs

@@ -8,7 +8,6 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-openvm-circuit-primitives-derive.workspace = true
 openvm-stark-backend.workspace = true
 openvm-stark-sdk.workspace = true
 openvm-circuit = { workspace = true, features = ["test-utils"] }
@@ -35,3 +34,6 @@ num-bigint.workspace = true
 [features]
 default = ["parallel"]
 parallel = ["openvm-circuit/parallel"]
+
+[package.metadata.cargo-shear]
+ignored = ["derive_more", "openvm-stark-backend"]

crates/toolchain/tests/Cargo.toml

@@ -3,7 +3,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use derive_more::derive::From;
 use eyre::Result;
 use num_bigint::BigUint;
 use openvm_algebra_circuit::{
@@ -13,14 +12,10 @@ use openvm_algebra_circuit::{
 use openvm_algebra_transpiler::{Fp2TranspilerExtension, ModularTranspilerExtension};
 use openvm_bigint_circuit::{Int256, Int256Executor, Int256Periphery};
 use openvm_circuit::{
-    arch::{
-        SystemConfig, SystemExecutor, SystemPeriphery, VmChipComplex, VmConfig, VmExecutor,
-        VmInventoryError,
-    },
-    derive::{AnyEnum, InstructionExecutor, VmConfig},
+    arch::{SystemConfig, VmExecutor},
+    derive::VmConfig,
     utils::air_test,
 };
-use openvm_circuit_primitives_derive::{Chip, ChipUsageGetter};
 use openvm_ecc_guest::k256::{SECP256K1_MODULUS, SECP256K1_ORDER};
 use openvm_instructions::exe::VmExe;
 use openvm_platform::memory::MEM_SIZE;

crates/toolchain/tests/tests/transpiler_tests.rs

@@ -317,12 +317,15 @@ pub fn vm_generic_config_derive(input: proc_macro::TokenStream) -> proc_macro::T
                     #field_name_upper(#periphery_name<F>),
                 });
                 create_chip_complex.push(quote! {
-                    let complex: VmChipComplex<F, Self::Executor, Self::Periphery> = complex.extend(&self.#field_name)?;
+                    let complex: ::openvm_circuit::arch::VmChipComplex<F, Self::Executor, Self::Periphery> = complex.extend(&self.#field_name)?;
                 });
             }
 
             let (source_executor_type, source_periphery_type) = match &source {
-                Source::System(_) => (quote! { SystemExecutor }, quote! { SystemPeriphery }),
+                Source::System(_) => (
+                    quote! { ::openvm_circuit::arch::SystemExecutor },
+                    quote! { ::openvm_circuit::arch::SystemPeriphery },
+                ),
                 Source::Config(field_ident) => {
                     let field_type = fields
                         .iter()
@@ -344,34 +347,34 @@ pub fn vm_generic_config_derive(input: proc_macro::TokenStream) -> proc_macro::T
             let periphery_type = Ident::new(&format!("{}Periphery", name), name.span());
 
             TokenStream::from(quote! {
-                #[derive(ChipUsageGetter, Chip, InstructionExecutor, From, AnyEnum)]
+                #[derive(::openvm_circuit::circuit_derive::ChipUsageGetter, ::openvm_circuit::circuit_derive::Chip, ::openvm_circuit::derive::InstructionExecutor, ::derive_more::derive::From, ::openvm_circuit::derive::AnyEnum)]
                 pub enum #executor_type<F: PrimeField32> {
                     #[any_enum]
                     #source_name_upper(#source_executor_type<F>),
                     #(#executor_enum_fields)*
                 }
 
-                #[derive(ChipUsageGetter, Chip, From, AnyEnum)]
+                #[derive(::openvm_circuit::circuit_derive::ChipUsageGetter, ::openvm_circuit::circuit_derive::Chip, ::derive_more::derive::From, ::openvm_circuit::derive::AnyEnum)]
                 pub enum #periphery_type<F: PrimeField32> {
                     #[any_enum]
                     #source_name_upper(#source_periphery_type<F>),
                     #(#periphery_enum_fields)*
                 }
 
-                impl<F: PrimeField32> VmConfig<F> for #name {
+                impl<F: PrimeField32> ::openvm_circuit::arch::VmConfig<F> for #name {
                     type Executor = #executor_type<F>;
                     type Periphery = #periphery_type<F>;
 
-                    fn system(&self) -> &SystemConfig {
-                        VmConfig::<F>::system(&self.#source_name)
+                    fn system(&self) -> &::openvm_circuit::arch::SystemConfig {
+                        ::openvm_circuit::arch::VmConfig::<F>::system(&self.#source_name)
                     }
-                    fn system_mut(&mut self) -> &mut SystemConfig {
-                        VmConfig::<F>::system_mut(&mut self.#source_name)
+                    fn system_mut(&mut self) -> &mut ::openvm_circuit::arch::SystemConfig {
+                        ::openvm_circuit::arch::VmConfig::<F>::system_mut(&mut self.#source_name)
                     }
 
                     fn create_chip_complex(
                         &self,
-                    ) -> Result<VmChipComplex<F, Self::Executor, Self::Periphery>, VmInventoryError> {
+                    ) -> Result<::openvm_circuit::arch::VmChipComplex<F, Self::Executor, Self::Periphery>, ::openvm_circuit::arch::VmInventoryError> {
                         let complex = self.#source_name.create_chip_complex()?;
                         #(#create_chip_complex)*
                         Ok(complex)

crates/vm/derive/src/lib.rs

@@ -1,10 +1,6 @@
-use derive_more::derive::From;
 use num_bigint::BigUint;
-use openvm_circuit::arch::{
-    SystemConfig, SystemExecutor, SystemPeriphery, VmChipComplex, VmConfig, VmInventoryError,
-};
-use openvm_circuit_derive::{AnyEnum, InstructionExecutor, VmConfig};
-use openvm_circuit_primitives_derive::{Chip, ChipUsageGetter};
+use openvm_circuit::arch::SystemConfig;
+use openvm_circuit_derive::VmConfig;
 use openvm_rv32im_circuit::*;
 use openvm_stark_backend::p3_field::PrimeField32;
 use serde::{Deserialize, Serialize};

extensions/algebra/circuit/src/config.rs

@@ -5,8 +5,7 @@ use openvm_bigint_transpiler::{
 };
 use openvm_circuit::{
     arch::{
-        SystemConfig, SystemExecutor, SystemPeriphery, SystemPort, VmChipComplex, VmConfig,
-        VmExtension, VmInventory, VmInventoryBuilder, VmInventoryError,
+        SystemConfig, SystemPort, VmExtension, VmInventory, VmInventoryBuilder, VmInventoryError,
     },
     system::phantom::PhantomChip,
 };

extensions/bigint/circuit/src/extension.rs

@@ -1,10 +1,6 @@
-use derive_more::derive::From;
 use openvm_algebra_circuit::*;
-use openvm_circuit::arch::{
-    SystemConfig, SystemExecutor, SystemPeriphery, VmChipComplex, VmConfig, VmInventoryError,
-};
-use openvm_circuit_derive::{AnyEnum, InstructionExecutor, VmConfig};
-use openvm_circuit_primitives_derive::{Chip, ChipUsageGetter};
+use openvm_circuit::arch::SystemConfig;
+use openvm_circuit_derive::VmConfig;
 use openvm_rv32im_circuit::*;
 use openvm_stark_backend::p3_field::PrimeField32;
 use serde::{Deserialize, Serialize};