Merge branch 'master' of github.com:calimero-network/core into feat--…

…add-bootstrap-to-meroctl
calimero-network · Dec 20, 2024 · 3794bd8 · 3794bd8
2 parents 682d1e9 + bb54d55
commit 3794bd8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/crates/meroctl/src/cli.rs b/crates/meroctl/src/cli.rs
@@ -53,7 +53,6 @@ pub enum SubCommands {
     App(AppCommand),
     Context(ContextCommand),
     Identity(IdentityCommand),
-    JsonRpc(CallCommand),
     Proxy(ProxyCommand),
     Call(CallCommand),
     Bootstrap(BootstrapCommand),
@@ -104,7 +103,6 @@ impl RootCommand {
             SubCommands::App(application) => application.run(&environment).await,
             SubCommands::Context(context) => context.run(&environment).await,
             SubCommands::Identity(identity) => identity.run(&environment).await,
-            SubCommands::JsonRpc(jsonrpc) => jsonrpc.run(&environment).await,
             SubCommands::Proxy(proxy) => proxy.run(&environment).await,
             SubCommands::Call(call) => call.run(&environment).await,
             SubCommands::Bootstrap(call) => call.run(&environment).await,

diff --git a/crates/meroctl/src/cli/bootstrap/start.rs b/crates/meroctl/src/cli/bootstrap/start.rs
@@ -184,7 +184,8 @@ impl StartBootstrapCommand {
     ) -> EyreResult<()> {
         println!(
             "Inviting node {:?} to context {:?}",
-            invitee_environment.args.node_name, context_id
+            invitee_environment.args.node_name,
+            context_id.to_string()
         );
 
         let invite_command = InviteCommand {