* Adapt service creation to new substrate API

* Fix test

* WIP

* Revert "WIP"

This reverts commit 816a3633e91abc943b12b2bfa77ce98b959e78b2.

* WIP

* Adapt to current code

* Fix tests

* Yet another fix

* CLEANUP

* WIP

* WIP

* WIP

* Adapt code to changes on substrate

* Adapt code

* Introduce kick.

* Fixes

* WIP

* WIP

* WIP

* WIP

* Bump

* Update sp-io

* WIP

Co-authored-by: Gav Wood <gavin@parity.io>
Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
This commit is contained in:
Cecile Tonglet
2021-01-20 13:45:25 +01:00
committed by GitHub
parent 0521abfdc2
commit 73af2d5816
11 changed files with 218 additions and 266 deletions
+1
View File
@@ -45,6 +45,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }
+2 -1
View File
@@ -69,7 +69,7 @@ pub type Client = FullClient<polkadot_test_runtime::RuntimeApi, PolkadotTestExec
pub use polkadot_service::FullBackend;
/// Create a new full node.
#[sc_cli::prefix_logs_with(config.network.node_name.as_str())]
#[sc_tracing::logging::prefix_logs_with(config.network.node_name.as_str())]
pub fn new_full(
config: Configuration,
is_collator: IsCollator,
@@ -198,6 +198,7 @@ pub fn node_config(
base_path: Some(base_path),
informant_output_format: Default::default(),
disable_log_reloading: false,
telemetry_handle: None,
}
}
@@ -21,15 +21,9 @@ use sp_keyring::Sr25519Keyring;
#[substrate_test_utils::test]
async fn ensure_test_service_build_blocks(task_executor: TaskExecutor) {
sc_cli::init_logger(
sc_cli::InitLoggerParams {
pattern: "".into(),
tracing_receiver: Default::default(),
tracing_targets: None,
disable_log_reloading: false,
disable_log_color: true,
},
).expect("Sets up logger");
let mut builder = sc_cli::GlobalLoggerBuilder::new("");
builder.with_colors(false);
builder.init().expect("Sets up logger");
let mut alice = run_validator_node(
task_executor.clone(),