Fix merge error

chainx-org · Jan 11, 2019 · d01b25b · d01b25b
1 parent 07ad624
commit d01b25b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/service/src/lib.rs b/core/service/src/lib.rs
@@ -34,7 +34,7 @@ extern crate substrate_client as client;
 extern crate substrate_client_db as client_db;
 extern crate parity_codec as codec;
 extern crate substrate_transaction_pool as transaction_pool;
-extern crate substrate_consensus_aura_primitives as aura_primitives;
+//extern crate substrate_consensus_aura_primitives as aura_primitives;
 //extern crate substrate_rpc_servers as rpc;
 extern crate target_info;
 extern crate tokio;
@@ -106,7 +106,7 @@ pub struct Service<Components: components::Components> {
 	/// Configuration of this Service
 	pub config: FactoryFullConfiguration<Components::Factory>,
 	//_rpc: Box<::std::any::Any + Send + Sync>,
-	_telemetry: Option<tel::Telemetry>,
+	_telemetry: Option<Arc<tel::Telemetry>>,
 }
 
 /// Creates bare client without any networking.