Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Clean up crate names and locations #4361

Merged
gnunicorn merged 11 commits into from
Dec 11, 2019
Merged

Clean up crate names and locations #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
49e3776
rename crate: sp-transaction-pool-api -> sp-transaction-pool
gnunicorn Dec 11, 2019
33273cc
move primitives/core/derive-debug -> primitives/derive-debug; primiti…
gnunicorn Dec 11, 2019
f01d833
rename crate sp-core-storage -> sp-storage
gnunicorn Dec 11, 2019
d37ada1
rename and move: test/utils/transaction-factory -> client/transaction…
gnunicorn Dec 11, 2019
9629f99
move transaction-factory -> node/transaction-factory
gnunicorn Dec 11, 2019
057f415
fix missing rename
gnunicorn Dec 11, 2019
39b2a6f
Move chain-spec-builder into bin/utils
gnunicorn Dec 11, 2019
c5c6fbf
move subkey into bin/utils
gnunicorn Dec 11, 2019
857a2d2
Update new subkey location
gnunicorn Dec 11, 2019
aa65d8c
Update docs to reflect new location for utils
gnunicorn Dec 11, 2019
d277ed4
fixing import name
gnunicorn Dec 11, 2019
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 .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ cargo-check-subkey:
except:
- /^v[0-9]+\.[0-9]+.*$/ # i.e. v1.0, v2.1rc1
script:
- cd ./bin/subkey
- cd ./bin/utils/subkey
- BUILD_DUMMY_WASM_BINARY=1 time cargo check --release
- sccache -s

Expand Down Expand Up @@ -300,7 +300,7 @@ build-linux-subkey:
variables:
- $DEPLOY_TAG
script:
- cd ./bin/subkey
- cd ./bin/utils/subkey
- BUILD_DUMMY_WASM_BINARY=1 time cargo build --release --verbose
- cd -
- sccache -s
Expand Down
7 changes: 6 additions & 1 deletion .maintain/rename-crates-for-2.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,14 @@ function rename() {
TO_RENAME=(
# OLD-CRATE-NAME NEW-CRATE-NAME

# post initial rename fixes
"sc-application-crypto sp-application-crypto"
"sp-transaction-pool-api sp-transaction-pool"
"sp-core-storage sp-storage"
"transaction-factory node-transaction-factory"

# PRIMITIVES
"substrate-application-crypto sp-application-crypto"
"sc-application-crypto sp-application-crypto"
"substrate-authority-discovery-primitives sp-authority-discovery"
"substrate-block-builder-runtime-api sp-block-builder"
"substrate-consensus-aura-primitives sp-consensus-aura"
Expand Down
98 changes: 49 additions & 49 deletions Cargo.lock
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ members = [
"bin/node/rpc",
"bin/node/runtime",
"bin/node/testing",
"bin/subkey",
"bin/node/transaction-factory",
"bin/utils/subkey",
"bin/utils/chain-spec-builder",
"client",
"client/api",
"client/authority-discovery",
Expand Down Expand Up @@ -101,8 +103,8 @@ members = [
"primitives/consensus/common",
"primitives/consensus/pow",
"primitives/core",
"primitives/core/debug-derive",
"primitives/core/storage",
"primitives/debug-derive",
"primitives/storage",
"primitives/externalities",
"primitives/finality-tracker",
"primitives/finality-grandpa",
Expand Down Expand Up @@ -134,11 +136,9 @@ members = [
"primitives/transaction-pool",
"primitives/trie",
"primitives/wasm-interface",
"test/utils/chain-spec-builder",
"test/utils/client",
"test/utils/runtime",
"test/utils/runtime/client",
"test/utils/transaction-factory",
"utils/build-script-utils",
"utils/fork-tree",
"utils/frame/rpc/support",
Expand Down
2 changes: 1 addition & 1 deletion bin/node-template/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sc-executor = { path = "../../client/executor" }
sc-service = { path = "../../client/service" }
inherents = { package = "sp-inherents", path = "../../primitives/inherents" }
txpool = { package = "sc-transaction-pool", path = "../../client/transaction-pool" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }
txpool-api = { package = "sp-transaction-pool", path = "../../primitives/transaction-pool" }
network = { package = "sc-network", path = "../../client/network" }
aura = { package = "sc-consensus-aura", path = "../../client/consensus/aura" }
aura-primitives = { package = "sp-consensus-aura", path = "../../primitives/consensus/aura" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node-template/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ support = { package = "frame-support", path = "../../../frame/support", default-
system = { package = "frame-system", path = "../../../frame/system", default-features = false }
timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false }
transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false }
sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false }
sp-transaction-pool = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool", default-features = false }
version = { package = "sp-version", path = "../../../primitives/version", default-features = false }

[build-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ client-api = { package = "sc-client-api", path = "../../../client/api" }
client = { package = "sc-client", path = "../../../client/" }
chain-spec = { package = "sc-chain-spec", path = "../../../client/chain-spec" }
txpool = { package = "sc-transaction-pool", path = "../../../client/transaction-pool" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" }
txpool-api = { package = "sp-transaction-pool", path = "../../../primitives/transaction-pool" }
network = { package = "sc-network", path = "../../../client/network" }
babe = { package = "sc-consensus-babe", path = "../../../client/consensus/babe" }
grandpa = { package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
Expand Down Expand Up @@ -83,8 +83,8 @@ node-executor = { path = "../executor" }
# CLI-specific dependencies
tokio = { version = "0.1.22", optional = true }
sc-cli = { path = "../../../client/cli", optional = true }
transaction-factory = { path = "../../../test/utils/transaction-factory", optional = true }
ctrlc = { version = "3.1.3", features = ["termination"], optional = true }
node-transaction-factory = { path = "../transaction-factory", optional = true }

# WASM-specific dependencies
libp2p = { version = "0.13.0", default-features = false, optional = true }
Expand Down Expand Up @@ -126,7 +126,7 @@ browser = [
]
cli = [
"sc-cli",
"transaction-factory",
"node-transaction-factory",
"tokio",
"ctrlc",
"sc-service/rocksdb",
Expand Down
Loading