Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate contract inspect #1636

Merged
merged 5 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FULL_HELP_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Tools for smart contract developers
* `id` — Generate the contract id for a given contract or asset
* `info` — Access info about contracts
* `init` — Initialize a Soroban project with an example contract
* `inspect` — Inspect a WASM file listing contract functions, meta, etc
* `inspect` — (Deprecated in favor of `contract info` subcommands) Inspect a WASM file listing contract functions, meta, etc
* `install` — Install a WASM file to the ledger without creating a contract instance
* `invoke` — Invoke a contract function
* `optimize` — Optimize a WASM file
Expand Down Expand Up @@ -630,7 +630,7 @@ Initialize a Soroban project with an example contract

## `stellar contract inspect`

Inspect a WASM file listing contract functions, meta, etc
(Deprecated in favor of `contract info` subcommands) Inspect a WASM file listing contract functions, meta, etc

**Usage:** `stellar contract inspect [OPTIONS] --wasm <WASM>`

Expand Down
8 changes: 7 additions & 1 deletion cmd/soroban-cli/src/commands/contract/inspect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ use std::{fmt::Debug, path::PathBuf};
use tracing::debug;

use super::SpecOutput;
use crate::commands::global::Args;
use crate::print::Print;
use crate::{config::locator, wasm};

#[derive(Parser, Debug, Clone)]
Expand Down Expand Up @@ -33,7 +35,11 @@ pub enum Error {
}

impl Cmd {
pub fn run(&self) -> Result<(), Error> {
pub fn run(&self, global_args: &Args) -> Result<(), Error> {
Print::new(global_args.quiet).warnln(
"`contract inspect` has been deprecated in favor of `contract info`. \
Please use `contract info` instead.",
);
let wasm = self.wasm.parse()?;
debug!("File: {}", self.wasm.wasm.to_string_lossy());
let output = match self.output {
Expand Down
5 changes: 3 additions & 2 deletions cmd/soroban-cli/src/commands/contract/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ pub enum Cmd {
/// Initialize a Soroban project with an example contract
Init(init::Cmd),

/// Inspect a WASM file listing contract functions, meta, etc
/// (Deprecated in favor of `contract info` subcommands) Inspect a WASM file listing contract functions, meta, etc
#[command(display_order = 100)]
Inspect(inspect::Cmd),

/// Install a WASM file to the ledger without creating a contract instance
Expand Down Expand Up @@ -147,7 +148,7 @@ impl Cmd {
Cmd::Id(id) => id.run()?,
Cmd::Info(info) => info.run().await?,
Cmd::Init(init) => init.run(global_args)?,
Cmd::Inspect(inspect) => inspect.run()?,
Cmd::Inspect(inspect) => inspect.run(global_args)?,
Cmd::Install(install) => install.run(global_args).await?,
Cmd::Invoke(invoke) => invoke.run(global_args).await?,
Cmd::Optimize(optimize) => optimize.run()?,
Expand Down
3 changes: 1 addition & 2 deletions cmd/soroban-cli/src/commands/network/container/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fn try_docker_desktop_socket(
&default_docker_desktop_host,
DEFAULT_TIMEOUT,
API_DEFAULT_VERSION,
).map_err(|e| {
).inspect_err(|_| {
print.errorln(format!(
"Failed to connect to the Docker daemon at {host:?}. Is the docker daemon running?"
));
Expand All @@ -167,7 +167,6 @@ fn try_docker_desktop_socket(
print.infoln(
"Please note that if you are using Docker Desktop, you may need to utilize the `--docker-host` flag to pass in the location of the docker socket on your machine."
);
e
})
}

Expand Down
Loading