chore: restructure proving service clients crate (#1102)

0xPolygonMiden · Jan 28, 2025 · 9930c36 · 9930c36
1 parent fb2284b
commit 9930c36
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changes
 
 - [BREAKING] Incremented minimum supported Rust version to 1.84.
+- [BREAKING] Moved `generated` module from `miden-proving-service-client` crate to `tx_prover::generated` hierarchy (#1102).
 
 ## 0.7.1 (2025-01-24) - `miden-objects` crate only
 

diff --git a/crates/miden-proving-service-client/build.rs b/crates/miden-proving-service-client/build.rs
@@ -49,7 +49,7 @@ fn copy_proto_files() -> miette::Result<()> {
 fn compile_tonic_client_proto() -> miette::Result<()> {
     let crate_root =
         PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR should be set"));
-    let dst_dir = crate_root.join("src").join("generated");
+    let dst_dir = crate_root.join("src").join("tx_prover").join("generated");
 
     // Remove `api.rs` if it exists.
     fs::remove_file(dst_dir.join("api.rs")).into_diagnostic().ok();

diff --git a/crates/miden-proving-service-client/src/lib.rs b/crates/miden-proving-service-client/src/lib.rs
@@ -13,12 +13,7 @@ extern crate std;
 use thiserror::Error;
 
 #[cfg(feature = "tx-prover")]
-pub mod generated;
-
-#[cfg(feature = "tx-prover")]
-mod prover;
-#[cfg(feature = "tx-prover")]
-pub use prover::RemoteTransactionProver;
+pub mod tx_prover;
 
 /// Protobuf definition for the Miden proving service
 pub const SERVICE_PROTO: &str = include_str!("../proto/api.proto");

diff --git a/...oving-service-client/src/generated/mod.rs → ...ice-client/src/tx_prover/generated/mod.rs b/...oving-service-client/src/generated/mod.rs → ...ice-client/src/tx_prover/generated/mod.rs
diff --git a/...service-client/src/generated/nostd/api.rs → ...ient/src/tx_prover/generated/nostd/api.rs b/...service-client/src/generated/nostd/api.rs → ...ient/src/tx_prover/generated/nostd/api.rs
diff --git a/...service-client/src/generated/nostd/mod.rs → ...ient/src/tx_prover/generated/nostd/mod.rs b/...service-client/src/generated/nostd/mod.rs → ...ient/src/tx_prover/generated/nostd/mod.rs
diff --git a/...g-service-client/src/generated/std/api.rs → ...client/src/tx_prover/generated/std/api.rs b/...g-service-client/src/generated/std/api.rs → ...client/src/tx_prover/generated/std/api.rs
diff --git a/...g-service-client/src/generated/std/mod.rs → ...client/src/tx_prover/generated/std/mod.rs b/...g-service-client/src/generated/std/mod.rs → ...client/src/tx_prover/generated/std/mod.rs
diff --git a/...iden-proving-service-client/src/prover.rs → ...oving-service-client/src/tx_prover/mod.rs b/...iden-proving-service-client/src/prover.rs → ...oving-service-client/src/tx_prover/mod.rs
@@ -1,12 +1,15 @@
+pub mod generated;
+
 use alloc::{
     boxed::Box,
     string::{String, ToString},
 };
 
+use generated::api_client::ApiClient;
 use miden_objects::transaction::{ProvenTransaction, TransactionWitness};
 use miden_tx::{utils::sync::RwLock, TransactionProver, TransactionProverError};
 
-use crate::{generated::api_client::ApiClient, RemoteProverError};
+use crate::RemoteProverError;
 
 // REMOTE TRANSACTION PROVER
 // ================================================================================================
@@ -84,7 +87,7 @@ impl TransactionProver for RemoteTransactionProver {
             .ok_or_else(|| TransactionProverError::other("client should be connected"))?
             .clone();
 
-        let request = tonic::Request::new(crate::generated::ProveTransactionRequest {
+        let request = tonic::Request::new(generated::ProveTransactionRequest {
             transaction_witness: tx_witness.to_bytes(),
         });