From 284ea4f2acf8871018aee4c30167547431ab3985 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Mon, 25 Mar 2024 10:18:02 -0300 Subject: [PATCH] chore: backport original Cardano command (#25) --- src/cardano/connect_node_socket.rs | 4 ++-- src/main.rs | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cardano/connect_node_socket.rs b/src/cardano/connect_node_socket.rs index 6d6931c..14c3fe8 100644 --- a/src/cardano/connect_node_socket.rs +++ b/src/cardano/connect_node_socket.rs @@ -61,7 +61,7 @@ fn define_remote_host(args: &Args, ctx: &crate::core::Context) -> miette::Result return Ok(format!( "cardanonode-{}-n2c-{}.{}", - args.instance, ctx.project.name, ctx.operator.entrypoint, + args.instance, ctx.namespace.name, ctx.operator.entrypoint, )); } @@ -126,7 +126,7 @@ fn define_socket_path( ctx: &crate::core::Context, ) -> miette::Result { let default = dirs - .ensure_tmp_dir(&ctx.project.name)? + .ensure_tmp_dir(&ctx.namespace.name)? .join(format!("{}.socket", args.instance)); let path = args.socket.to_owned().unwrap_or(default); diff --git a/src/main.rs b/src/main.rs index 5f49fed..a203dea 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,14 +4,12 @@ use tracing::Level; use tracing_indicatif::IndicatifLayer; use tracing_subscriber::prelude::*; +mod cardano; mod core; mod dirs; mod init; mod pages; -// namespaces -mod r#use; - #[derive(Parser)] #[command(author, version, about, long_about = None)] #[command(propagate_version = true)] @@ -47,6 +45,9 @@ pub enum Commands { /// interact with Demeter Pages Pages(pages::Args), + + /// Cardano-specific commands + Cardano(cardano::Args), } pub struct Cli { @@ -85,5 +86,6 @@ async fn main() -> miette::Result<()> { match args.command { Commands::Init(args) => init::run(args, &cli.dirs).await, Commands::Pages(args) => pages::run(args, &cli).await, + Commands::Cardano(args) => cardano::run(args, &cli).await, } }