Post-rebase cleanup.

nexus-xyz · Jun 18, 2024 · 153a346 · 153a346
1 parent 586c924
commit 153a346
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 15 deletions.
diff --git a/tools/src/command/compress.rs b/tools/src/command/compress.rs
@@ -3,16 +3,14 @@ use std::{io, path::PathBuf};
 use anyhow::Context;
 use clap::Args;
 
-use nexus_config::{vm as vm_config, Config};
+use nexus_api::config::{vm as vm_config, Config};
 
 use super::{public_params::format_params_file, spartan_key::SetupArgs};
-use super::prove::{save_proof, TERMINAL_MODE};
 
 use crate::{
     command::{cache_path, spartan_key::spartan_setup},
     LOG_TARGET, TERMINAL_MODE,
 };
-use nexus_api::config::{vm as vm_config, Config};
 
 #[derive(Debug, Args)]
 pub struct CompressArgs {

diff --git a/tools/src/command/mod.rs b/tools/src/command/mod.rs
@@ -1,7 +1,7 @@
 use clap::Subcommand;
 use std::path::PathBuf;
 
-use nexus_config::{Config, MiscConfig};
+use nexus_api::config::{Config, MiscConfig};
 
 use super::ENV;
 

diff --git a/tools/src/command/prove.rs b/tools/src/command/prove.rs
@@ -6,16 +6,15 @@ use std::{
 use anyhow::Context;
 use clap::Args;
 
-use nexus_config::{vm as vm_config, Config};
+use nexus_api::config::{vm as vm_config, Config};
 
 use crate::{
     command::{
         jolt,
         public_params::{setup_params, SetupArgs},
     },
     utils::{cargo, path_to_artifact},
-    LOG_TARGET,
-    TERMINAL_MODE,
+    LOG_TARGET, TERMINAL_MODE,
 };
 
 #[derive(Debug, Args)]

diff --git a/tools/src/command/public_params.rs b/tools/src/command/public_params.rs
@@ -5,7 +5,7 @@ use std::{
 
 use anyhow::Context;
 
-use nexus_config::{
+use nexus_api::config::{
     vm::{self as vm_config, ProverImpl},
     Config,
 };

diff --git a/tools/src/command/public_params/command_args.rs b/tools/src/command/public_params/command_args.rs
@@ -1,7 +1,7 @@
 use std::path::PathBuf;
 
 use clap::{Args, Subcommand};
-use nexus_config::vm as vm_config;
+use nexus_api::config::vm as vm_config;
 
 #[derive(Debug, Args)]
 pub struct PublicParamsArgs {

diff --git a/tools/src/command/spartan_key.rs b/tools/src/command/spartan_key.rs
@@ -6,7 +6,7 @@ use std::{
 
 use anyhow::Context;
 
-use nexus_config::{vm as vm_config, Config};
+use nexus_api::config::{vm as vm_config, Config};
 use nexus_api::prover::nova::{srs::get_min_srs_size, types::ComPP};
 
 use super::public_params::{format_params_file, format_srs_file};

diff --git a/tools/src/command/verify.rs b/tools/src/command/verify.rs
@@ -8,18 +8,18 @@ use anyhow::Context;
 use ark_serialize::CanonicalDeserialize;
 use clap::Args;
 
-use nexus_config::{
-    vm::{NovaImpl, ProverImpl, VmConfig},
-    Config,
-};
-use nexus_api::prover::nova::types::{ComPCDNode, ComProof, IVCProof, PCDNode};
 use super::{
     jolt,
     prove::{CommonProveArgs, LocalProveArgs},
     public_params::format_params_file,
     spartan_key::format_key_file,
 };
 use crate::{command::cache_path, LOG_TARGET, TERMINAL_MODE};
+use nexus_api::config::{
+    vm::{NovaImpl, ProverImpl, VmConfig},
+    Config,
+};
+use nexus_api::prover::nova::types::{ComPCDNode, ComProof, IVCProof, PCDNode};
 
 #[derive(Debug, Args)]
 pub struct VerifyArgs {