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

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

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/meroctl/Cargo.toml b/crates/meroctl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "meroctl"
-version = "0.2.1"
+version = "0.2.0"
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true

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 {
@@ -208,7 +209,7 @@ impl StartBootstrapCommand {
             private_key: invitee_private_key,
             invitation_payload,
         };
-        join_command.join(invitee_environment).await?;
+        join_command.run(invitee_environment).await?;
         println!(
             "Node {:?} joined successfully.",
             invitee_environment.args.node_name

diff --git a/crates/meroctl/src/cli/context/join.rs b/crates/meroctl/src/cli/context/join.rs
@@ -38,11 +38,6 @@ impl Report for JoinContextResponse {
 
 impl JoinCommand {
     pub async fn run(self, environment: &Environment) -> EyreResult<()> {
-        let _ignored = self.join(environment).await?;
-        Ok(())
-    }
-
-    pub async fn join(self, environment: &Environment) -> EyreResult<()> {
         let config = load_config(&environment.args.home, &environment.args.node_name)?;
 
         let response: JoinContextResponse = do_request(