Skip to content

Commit b55ad61

Browse files
authored
[Tooling] Combine some tools to a single binary. (aptos-labs#10709)
1 parent 059808f commit b55ad61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+705
-890
lines changed

.github/workflows/workflow-run-module-verify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Build CLI binaries in release mode
6262
shell: bash
63-
run: cargo build --release -p aptos-db-tool
63+
run: cargo build --release -p aptos-debugger
6464

6565
- name: Run module-verify in parallel
6666
shell: bash

.github/workflows/workflow-run-replay-verify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103

104104
- name: Build CLI binaries in release mode
105105
shell: bash
106-
run: cargo build --release -p aptos-db-tool
106+
run: cargo build --release -p aptos-debugger
107107

108108
- name: Run replay-verify in parallel
109109
shell: bash

Cargo.lock

Lines changed: 42 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ members = [
5454
"crates/aptos-compression",
5555
"crates/aptos-crypto",
5656
"crates/aptos-crypto-derive",
57+
"crates/aptos-debugger",
5758
"crates/aptos-drop-helper",
5859
"crates/aptos-enum-conversion-derive",
5960
"crates/aptos-faucet/cli",
@@ -115,7 +116,6 @@ members = [
115116
"ecosystem/node-checker",
116117
"ecosystem/node-checker/fn-check-client",
117118
"execution/block-partitioner",
118-
"execution/db-bootstrapper",
119119
"execution/executor",
120120
"execution/executor-benchmark",
121121
"execution/executor-service",
@@ -242,13 +242,13 @@ default-members = [
242242
"aptos-node",
243243
"consensus/safety-rules",
244244
"crates/aptos",
245+
"crates/aptos-debugger",
245246
"crates/aptos-faucet/service",
246247
"crates/aptos-keygen",
247248
"crates/aptos-rate-limiter",
248249
"crates/aptos-rosetta",
249250
"crates/transaction-emitter",
250251
"aptos-move/framework",
251-
"execution/db-bootstrapper",
252252
"storage/backup/backup-cli",
253253
"ecosystem/node-checker",
254254
]
@@ -296,7 +296,7 @@ aptos-data-streaming-service = { path = "state-sync/data-streaming-service" }
296296
aptos-db = { path = "storage/aptosdb" }
297297
aptos-db-indexer = { path = "storage/indexer" }
298298
aptos-db-tool = { path = "storage/db-tool" }
299-
aptos-debugger = { path = "aptos-move/aptos-debugger" }
299+
aptos-debugger = { path = "crates/aptos-debugger" }
300300
aptos-drop-helper = { path = "crates/aptos-drop-helper" }
301301
aptos-event-notifications = { path = "state-sync/inter-component/event-notifications" }
302302
aptos-executable-store = { path = "storage/executable-store" }
@@ -350,6 +350,7 @@ aptos-mempool = { path = "mempool" }
350350
aptos-mempool-notifications = { path = "state-sync/inter-component/mempool-notifications" }
351351
aptos-memsocket = { path = "network/memsocket" }
352352
aptos-metrics-core = { path = "crates/aptos-metrics-core" }
353+
aptos-move-debugger = { path = "aptos-move/aptos-debugger" }
353354
aptos-move-examples = { path = "aptos-move/move-examples" }
354355
aptos-moving-average = { path = "crates/moving-average" }
355356
aptos-mvhashmap = { path = "aptos-move/mvhashmap" }
@@ -741,10 +742,6 @@ debug-assertions = true
741742
[profile.bench]
742743
debug = true
743744

744-
# This is a temporary workaround to avoid multiple library
745-
# definitions for LZ4 (caused by rust-rocksdb).
746-
# This will be removed once our pull requests land.
747-
# https://github.com/rust-rocksdb/rust-rocksdb/issues/666
748745
[patch.crates-io]
749746
serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "839aed62a20ddccf043c08961cfe74875741ccba" }
750747
merlin = { git = "https://github.com/aptos-labs/merlin" }

aptos-move/aptos-debugger/Cargo.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
[package]
2-
name = "aptos-debugger"
2+
name = "aptos-move-debugger"
33
version = "0.1.0"
4-
authors = ["Aptos Labs <[email protected]>"]
5-
description = "A tool to replay transactions on chain and to execute transactions locally with remote backend"
6-
repository = "https://github.com/aptos-labs/aptos-core"
7-
homepage = "https://aptoslabs.com"
8-
license = "Apache-2.0"
9-
publish = false
10-
edition = "2021"
11-
default-run = "aptos-debugger"
4+
description = "A tool to replay transactions on chain and to execute transactions locally."
5+
6+
# Workspace inherited keys
7+
authors = { workspace = true }
8+
edition = { workspace = true }
9+
homepage = { workspace = true }
10+
license = { workspace = true }
11+
publish = { workspace = true }
12+
repository = { workspace = true }
13+
rust-version = { workspace = true }
1214

1315
[dependencies]
1416
anyhow = { workspace = true }
@@ -39,6 +41,3 @@ move-vm-test-utils = { workspace = true }
3941
regex = { workspace = true }
4042
tokio = { workspace = true }
4143
url = { workspace = true }
42-
43-
[[bin]]
44-
name = "bcs-txn-decoder"

0 commit comments

Comments
 (0)