Merge node, node-cli, node-executor, node-rpc-client into one#3192
Merge node, node-cli, node-executor, node-rpc-client into one#3192tomaka wants to merge 10 commits intoparitytech:masterfrom
Conversation
bkchr
left a comment
There was a problem hiding this comment.
I would like to see the root Cargo.toml to be cleaner.
|
|
||
| [dependencies] | ||
| cli = { package = "node-cli", path = "node/cli" } | ||
| log = "0.4" |
There was a problem hiding this comment.
Hmm, don't we maybe want to clean this up and just keep the members in the root Cargo.toml.
The following should help for cargo run:
rust-lang/cargo#7032
(I'm not sure if this already included in stable or not.
There was a problem hiding this comment.
Can we just wait and postpone until this is in stable?
There was a problem hiding this comment.
You mean around 2022
There was a problem hiding this comment.
This is already stabilized, so I would assume that it is released with the next rust release? rust-lang/cargo#7056
| use runtime_primitives::traits::{Header as HeaderT, Hash as HashT}; | ||
| use runtime_primitives::{generic::Era, ApplyOutcome, ApplyError, ApplyResult, Perbill}; | ||
| use runtime_primitives::weights::{WeightMultiplier, SimpleDispatchInfo, WeighData}; | ||
| use sr_primitives::traits::{Header as HeaderT, Hash as HashT}; |
There was a problem hiding this comment.
I am quite happy to see some else also changing these --not wrong but confusing-- imports; it is quite annoying that we have core/sr-primitives imported into different crates with different names; makes it even more confusing that we have an actual runtime-primitives in node.
I have some thoughts on codifying imports a bit and adding it to our style guide maybe. Will make an issue for it.
Close #2934
Merges as much as possible in the Substrate node. The objective is to simplify and clean up a bit the architecture.
Moves the code of
node-cliandnode-executorinnode/src.I moved the main executable in a
src/binsubdirectory instead of leaving it insrc.I initially wanted to
node-rpc-clientinsrc/binas well, but if you do that thencargo runrequires being passed which binary to run.