Skip to content

Commit

Permalink
Replace cli xdr command with stellar-xdr cli
Browse files Browse the repository at this point in the history
  • Loading branch information
leighmcculloch committed Dec 18, 2023
1 parent 9ea424d commit a2f6aa7
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 105 deletions.
9 changes: 9 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,17 @@ tracing-appender = "0.2.2"
which = "4.4.0"
wasmparser = "0.90.0"

[patch.crates-io.stellar-xdr]
git = "https://github.com/stellar/rs-stellar-xdr"
rev = "c9ba372b1b40a047c0b249972e18334845763b78"

# [patch."https://github.com/stellar/rs-soroban-env"]
# soroban-env-host = { path = "../rs-soroban-env/soroban-env-host/" }
# [patch."https://github.com/stellar/rs-soroban-sdk"]
# soroban-spec = { path = "../rs-soroban-sdk/soroban-spec/" }
# soroban-token-spec = { path = "../rs-soroban-sdk/soroban-token-spec/" }
# soroban-sdk = { path = "../rs-soroban-sdk/soroban-sdk/" }
# [patch."https://github.com/stellar/rs-stellar-xdr"]
# stellar-xdr = { path = "../rs-stellar-xdr/" }
# path = "../rs-stellar-xdr/"

[profile.test-wasms]
inherits = "release"
Expand Down
1 change: 1 addition & 0 deletions cmd/soroban-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ default = []
opt = ["dep:wasm-opt"]

[dependencies]
stellar-xdr = { workspace = true, features = ["cli"] }
soroban-env-host = { workspace = true }
soroban-spec = { workspace = true }
soroban-spec-json = { workspace = true }
Expand Down
5 changes: 2 additions & 3 deletions cmd/soroban-cli/src/commands/lab/mod.rs
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
use clap::Subcommand;

pub mod token;
pub mod xdr;

#[derive(Debug, Subcommand)]
pub enum Cmd {
/// Wrap, create, and manage token contracts
Token(token::Root),

/// Decode xdr
Xdr(xdr::Cmd),
Xdr(stellar_xdr::cli::Root),
}

#[derive(thiserror::Error, Debug)]
pub enum Error {
#[error(transparent)]
Token(#[from] token::Error),
#[error(transparent)]
Xdr(#[from] xdr::Error),
Xdr(#[from] stellar_xdr::cli::Error),
}

impl Cmd {
Expand Down
34 changes: 0 additions & 34 deletions cmd/soroban-cli/src/commands/lab/xdr.rs

This file was deleted.

66 changes: 0 additions & 66 deletions cmd/soroban-cli/src/commands/lab/xdr/decode.rs

This file was deleted.

0 comments on commit a2f6aa7

Please sign in to comment.