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

Companion for substrate #9319 #3456

Merged
8 commits merged into from
Jul 30, 2021
Merged

Companion for substrate #9319 #3456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f68bd6
move client consensus code out of primitives
gilescope Jul 10, 2021
4e0dc46
merging crates
gilescope Jul 19, 2021
6e76705
import tweak
gilescope Jul 20, 2021
50447b9
Fixing build: ServiceFactory is a word...
gilescope Jul 20, 2021
32431ee
updating lock file
gilescope Jul 20, 2021
a3062d2
Fixed typo in error message
gilescope Jul 21, 2021
ed3259d
Merge branch 'master' into giles-split-consensus
Jul 28, 2021
f73f1b3
update Substrate
Jul 30, 2021
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
Prev Previous commit
Next Next commit
merging crates
  • Loading branch information
@gilescope
gilescope committed Jul 20, 2021
commit 4e0dc4683cd5266712fcff5fda4b82f32a42a09e
1 change: 0 additions & 1 deletion bridges/bin/millau/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion bridges/bin/millau/node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub fn new_partial(
FullClient,
FullBackend,
FullSelectChain,
sc_consensus_api::DefaultImportQueue<Block, FullClient>,
sc_consensus::DefaultImportQueue<Block, FullClient>,
sc_transaction_pool::FullPool<Block, FullClient>,
(
sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
Expand Down
1 change: 0 additions & 1 deletion bridges/bin/rialto/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["wasmtime"] }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion bridges/bin/rialto/node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub fn new_partial(
FullClient,
FullBackend,
FullSelectChain,
sc_consensus_api::DefaultImportQueue<Block, FullClient>,
sc_consensus::DefaultImportQueue<Block, FullClient>,
sc_transaction_pool::FullPool<Block, FullClient>,
(
sc_finality_grandpa::GrandpaBlockImport<FullBackend, Block, FullClient, FullSelectChain>,
Expand Down
2 changes: 1 addition & 1 deletion node/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }

sc-consensus-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down
1 change: 0 additions & 1 deletion node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-finality-grandpa-warp-sync = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
Expand Down
6 changes: 3 additions & 3 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub use polkadot_client::{
pub use chain_spec::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec, RococoChainSpec};
pub use consensus_common::{Proposal, SelectChain, block_validation::Chain};
pub use polkadot_primitives::v1::{Block, BlockId, CollatorPair, Hash, Id as ParaId};
pub use sc_consensus_api::BlockImport;
pub use sc_consensus::BlockImport;
pub use sc_client_api::{Backend, ExecutionStrategy, CallExecutor};
pub use sc_consensus::LongestChain;
pub use sc_executor::NativeExecutionDispatch;
Expand Down Expand Up @@ -236,7 +236,7 @@ fn new_partial<RuntimeApi, Executor>(
) -> Result<
service::PartialComponents<
FullClient<RuntimeApi, Executor>, FullBackend, FullSelectChain,
sc_consensus_api::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>,
sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>,
sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
(
impl Fn(
Expand Down Expand Up @@ -1119,7 +1119,7 @@ pub fn new_chain_ops(
(
Arc<Client>,
Arc<FullBackend>,
sc_consensus_api::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
sc_consensus::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
TaskManager,
),
Error
Expand Down
2 changes: 1 addition & 1 deletion node/test/client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl DefaultTestClientBuilderExt for TestClientBuilder {
#[cfg(test)]
mod tests{
use super::*;
use sc_consensus_api::BlockOrigin;
use sp_consensus::BlockOrigin;

#[test]
fn ensure_test_client_can_build_and_import_block() {
Expand Down