Cesar Rodas преди 5 месеца
родител
ревизия
25c59b2af4
променени са 4 файла, в които са добавени 7 реда и са изтрити 10 реда
  1. 3 5
      crates/cdk-signatory/src/bin/cli/mod.rs
  2. 4 1
      crates/cdk-signatory/src/bin/signatory.rs
  3. 0 3
      crates/cdk-signatory/src/lib.rs
  4. 0 1
      crates/cdk/src/mint/mod.rs

+ 3 - 5
crates/cdk-signatory/src/cli.rs → crates/cdk-signatory/src/bin/cli/mod.rs

@@ -15,13 +15,12 @@ use cdk_common::database::MintKeysDatabase;
 use cdk_common::CurrencyUnit;
 #[cfg(feature = "redb")]
 use cdk_redb::MintRedbDatabase;
+use cdk_signatory::{db_signatory, grpc_server};
 use cdk_sqlite::MintSqliteDatabase;
 use clap::Parser;
 use tracing::Level;
 use tracing_subscriber::EnvFilter;
 
-use crate::{db_signatory, grpc_server};
-
 const DEFAULT_WORK_DIR: &str = ".cdk-signatory";
 const ENV_MNEMONIC: &str = "CDK_MINTD_MNEMONIC";
 
@@ -56,7 +55,7 @@ struct Cli {
 }
 
 /// Main function for the signatory standalone binary
-pub async fn main() -> Result<()> {
+pub async fn cli_main() -> Result<()> {
     let args: Cli = Cli::parse();
     let default_filter = args.log_level;
     let supported_units = args
@@ -119,8 +118,7 @@ pub async fn main() -> Result<()> {
                 #[cfg(feature = "redb")]
                 {
                     let redb_path = work_dir.join("cdk-cli.redb");
-                    let db = Arc::new(MintRedbDatabase::new(&redb_path)?);
-                    db
+                    Arc::new(MintRedbDatabase::new(&redb_path)?)
                 }
                 #[cfg(not(feature = "redb"))]
                 {

+ 4 - 1
crates/cdk-signatory/src/bin/signatory.rs

@@ -1,3 +1,6 @@
+#[cfg(not(target_arch = "wasm32"))]
+mod cli;
+
 fn main() {
     #[cfg(target_arch = "wasm32")]
     println!("Not supported in wasm32");
@@ -6,7 +9,7 @@ fn main() {
         use tokio::runtime::Runtime;
         let rt = Runtime::new().unwrap();
         rt.block_on(async {
-            cdk_signatory::cli::main().await.unwrap();
+            cli::cli_main().await.unwrap();
         });
     }
 }

+ 0 - 3
crates/cdk-signatory/src/lib.rs

@@ -19,6 +19,3 @@ mod common;
 pub mod db_signatory;
 pub mod embedded;
 pub mod signatory;
-
-#[cfg(not(target_arch = "wasm32"))]
-pub mod cli;

+ 0 - 1
crates/cdk/src/mint/mod.rs

@@ -611,7 +611,6 @@ mod tests {
         let signatory = Arc::new(
             cdk_signatory::db_signatory::DbSignatory::new(
                 localstore.clone(),
-                None,
                 config.seed,
                 config.supported_units,
                 HashMap::new(),