From 153a346601394d563bfeeae2838314fa4d2e55fc Mon Sep 17 00:00:00 2001
From: Samuel Judson <sam@sjudson.com>
Date: Tue, 18 Jun 2024 14:25:38 -0400
Subject: [PATCH] Post-rebase cleanup.

---
 tools/src/command/compress.rs                   |  4 +---
 tools/src/command/mod.rs                        |  2 +-
 tools/src/command/prove.rs                      |  5 ++---
 tools/src/command/public_params.rs              |  2 +-
 tools/src/command/public_params/command_args.rs |  2 +-
 tools/src/command/spartan_key.rs                |  2 +-
 tools/src/command/verify.rs                     | 10 +++++-----
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/tools/src/command/compress.rs b/tools/src/command/compress.rs
index 4440dfcef..8171127c9 100644
--- 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
index f1e7c7cda..ed4b01a5d 100644
--- 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
index e737960fc..b63d68c22 100644
--- a/tools/src/command/prove.rs
+++ b/tools/src/command/prove.rs
@@ -6,7 +6,7 @@ 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::{
@@ -14,8 +14,7 @@ use crate::{
         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
index 9e5857e56..aef57061d 100644
--- 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
index a8626eb26..b29262fb1 100644
--- 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
index bb96c6204..41d0dad48 100644
--- 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
index eba0c8e38..2e4023812 100644
--- a/tools/src/command/verify.rs
+++ b/tools/src/command/verify.rs
@@ -8,11 +8,6 @@ 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},
@@ -20,6 +15,11 @@ use super::{
     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 {