Skip to content

Commit

Permalink
[Tooling] Combine some tools to a single binary. (#10709)
Browse files Browse the repository at this point in the history
  • Loading branch information
grao1991 authored Oct 29, 2023
1 parent 059808f commit b55ad61
Show file tree
Hide file tree
Showing 44 changed files with 705 additions and 890 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/workflow-run-module-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Build CLI binaries in release mode
shell: bash
run: cargo build --release -p aptos-db-tool
run: cargo build --release -p aptos-debugger

- name: Run module-verify in parallel
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-run-replay-verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

- name: Build CLI binaries in release mode
shell: bash
run: cargo build --release -p aptos-db-tool
run: cargo build --release -p aptos-debugger

- name: Run replay-verify in parallel
shell: bash
Expand Down
85 changes: 42 additions & 43 deletions Cargo.lock

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

11 changes: 4 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ members = [
"crates/aptos-compression",
"crates/aptos-crypto",
"crates/aptos-crypto-derive",
"crates/aptos-debugger",
"crates/aptos-drop-helper",
"crates/aptos-enum-conversion-derive",
"crates/aptos-faucet/cli",
Expand Down Expand Up @@ -115,7 +116,6 @@ members = [
"ecosystem/node-checker",
"ecosystem/node-checker/fn-check-client",
"execution/block-partitioner",
"execution/db-bootstrapper",
"execution/executor",
"execution/executor-benchmark",
"execution/executor-service",
Expand Down Expand Up @@ -242,13 +242,13 @@ default-members = [
"aptos-node",
"consensus/safety-rules",
"crates/aptos",
"crates/aptos-debugger",
"crates/aptos-faucet/service",
"crates/aptos-keygen",
"crates/aptos-rate-limiter",
"crates/aptos-rosetta",
"crates/transaction-emitter",
"aptos-move/framework",
"execution/db-bootstrapper",
"storage/backup/backup-cli",
"ecosystem/node-checker",
]
Expand Down Expand Up @@ -296,7 +296,7 @@ aptos-data-streaming-service = { path = "state-sync/data-streaming-service" }
aptos-db = { path = "storage/aptosdb" }
aptos-db-indexer = { path = "storage/indexer" }
aptos-db-tool = { path = "storage/db-tool" }
aptos-debugger = { path = "aptos-move/aptos-debugger" }
aptos-debugger = { path = "crates/aptos-debugger" }
aptos-drop-helper = { path = "crates/aptos-drop-helper" }
aptos-event-notifications = { path = "state-sync/inter-component/event-notifications" }
aptos-executable-store = { path = "storage/executable-store" }
Expand Down Expand Up @@ -350,6 +350,7 @@ aptos-mempool = { path = "mempool" }
aptos-mempool-notifications = { path = "state-sync/inter-component/mempool-notifications" }
aptos-memsocket = { path = "network/memsocket" }
aptos-metrics-core = { path = "crates/aptos-metrics-core" }
aptos-move-debugger = { path = "aptos-move/aptos-debugger" }
aptos-move-examples = { path = "aptos-move/move-examples" }
aptos-moving-average = { path = "crates/moving-average" }
aptos-mvhashmap = { path = "aptos-move/mvhashmap" }
Expand Down Expand Up @@ -741,10 +742,6 @@ debug-assertions = true
[profile.bench]
debug = true

# This is a temporary workaround to avoid multiple library
# definitions for LZ4 (caused by rust-rocksdb).
# This will be removed once our pull requests land.
# https://github.com/rust-rocksdb/rust-rocksdb/issues/666
[patch.crates-io]
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "839aed62a20ddccf043c08961cfe74875741ccba" }
merlin = { git = "https://github.com/aptos-labs/merlin" }
Expand Down
23 changes: 11 additions & 12 deletions aptos-move/aptos-debugger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[package]
name = "aptos-debugger"
name = "aptos-move-debugger"
version = "0.1.0"
authors = ["Aptos Labs <[email protected]>"]
description = "A tool to replay transactions on chain and to execute transactions locally with remote backend"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptoslabs.com"
license = "Apache-2.0"
publish = false
edition = "2021"
default-run = "aptos-debugger"
description = "A tool to replay transactions on chain and to execute transactions locally."

# Workspace inherited keys
authors = { workspace = true }
edition = { workspace = true }
homepage = { workspace = true }
license = { workspace = true }
publish = { workspace = true }
repository = { workspace = true }
rust-version = { workspace = true }

[dependencies]
anyhow = { workspace = true }
Expand Down Expand Up @@ -39,6 +41,3 @@ move-vm-test-utils = { workspace = true }
regex = { workspace = true }
tokio = { workspace = true }
url = { workspace = true }

[[bin]]
name = "bcs-txn-decoder"
Loading

0 comments on commit b55ad61

Please sign in to comment.