Skip to content
This repository was archived by the owner on Feb 21, 2024. It is now read-only.

Commit aabf9f9

Browse files
authored
Merge pull request paritytech#260 from subspace/extract-subspace-service
Extract `service.rs` from subspace-node as a new crate `subspace-service`
2 parents 902579b + ce228cb commit aabf9f9

File tree

17 files changed

+445
-374
lines changed

17 files changed

+445
-374
lines changed

Cargo.lock

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

crates/cirrus-node-primitives/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ pub type CollatorSignature = collator_app::Signature;
152152

153153
/// Configuration for the collation generator
154154
pub struct CollationGenerationConfig {
155-
/// Collator's authentication key, so it can sign things.
156-
pub key: CollatorPair,
157155
/// Transaction bundle function. See [`BundlerFn`] for more details.
158156
pub bundler: BundlerFn,
159157
/// State processor function. See [`ProcessorFn`] for more details.

crates/subspace-node/Cargo.toml

Lines changed: 9 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,59 +19,30 @@ include = [
1919
targets = ["x86_64-unknown-linux-gnu"]
2020

2121
[dependencies]
22-
cirrus-node-primitives = { version = "0.1.0", path = "../cirrus-node-primitives" }
23-
frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
22+
clap = { version = "3.0.13", features = ["derive"] }
2423
frame-benchmarking-cli = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
2524
frame-support = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
2625
futures = "0.3.19"
27-
jsonrpc-core = "18.0.0"
28-
lru = "0.7.2"
29-
pallet-transaction-payment-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
30-
polkadot-overseer = { path = "../../polkadot/node/overseer" }
31-
polkadot-node-collation-generation = { path = "../../polkadot/node/collation-generation" }
32-
polkadot-node-core-chain-api = { path = "../../polkadot/node/core/chain-api" }
33-
polkadot-node-core-runtime-api = { path = "../../polkadot/node/core/runtime-api" }
34-
polkadot-node-subsystem-util = { path = "../../polkadot/node/subsystem-util" }
35-
sc-basic-authorship = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
3626
sc-cli = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927", features = ["wasmtime"] }
37-
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
38-
sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
39-
sc-consensus-subspace = { version = "0.1.0", path = "../sc-consensus-subspace" }
40-
sc-consensus-subspace-rpc = { version = "0.1.0", path = "../sc-consensus-subspace-rpc" }
41-
sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
42-
sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
4327
sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927", features = ["wasmtime"] }
44-
sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
45-
sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
46-
sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
4728
sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927", features = ["wasmtime"] }
4829
sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
49-
sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
50-
sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
51-
serde_json = "1.0.74"
52-
sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
53-
sp-authorship = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
54-
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
55-
sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
56-
sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
57-
sp-consensus-subspace = { version = "0.1.0", path = "../sp-consensus-subspace" }
5830
sp-core = { version = "5.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
5931
sp-runtime = { version = "5.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
60-
sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
61-
clap = { version = "3.0.13", features = ["derive"] }
62-
subspace-runtime = { version = "0.1.0", features = ["do-not-enforce-cost-of-storage"], path = "../subspace-runtime" }
63-
substrate-frame-rpc-system = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
64-
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
32+
subspace-runtime = { version = "0.1.0", path = "../subspace-runtime" }
33+
subspace-runtime-primitives = { version = "0.1.0", path = "../subspace-runtime-primitives" }
34+
subspace-service = { version = "0.1.0", path = "../subspace-service" }
6535
thiserror = "1.0.30"
6636

6737
[build-dependencies]
6838
substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" }
6939

7040
[features]
71-
default = []
41+
default = ["do-not-enforce-cost-of-storage"]
42+
do-not-enforce-cost-of-storage = [
43+
"subspace-runtime/do-not-enforce-cost-of-storage"
44+
]
7245
runtime-benchmarks = [
7346
"subspace-runtime/runtime-benchmarks",
7447
]
75-
# This feature makes `testnet` chain spec to use `chain-spec.json` file in the root of the repo instead of compiled
76-
# version
77-
json-chain-spec = []
48+
json-chain-spec = ["subspace-service/json-chain-spec"]

0 commit comments

Comments
 (0)