From 91024a173919ff0830e145574002e77fcbe16f21 Mon Sep 17 00:00:00 2001
From: Cecile Tonglet <cecile@parity.io>
Date: Tue, 18 Feb 2020 11:11:16 +0100
Subject: [PATCH] Make GenesisSource thread-safe (#4960)

This change makes service's Configuration and GenesisSource thread-safe.

Related to: https://github.com/paritytech/cumulus/issues/44

Forked at: be075893b543f8e3a9a160766c9ae1182a4b2ffa
Parent branch: origin/master
---
 substrate/client/chain-spec/src/chain_spec.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/substrate/client/chain-spec/src/chain_spec.rs b/substrate/client/chain-spec/src/chain_spec.rs
index 696fef5664..ab9c851bdd 100644
--- a/substrate/client/chain-spec/src/chain_spec.rs
+++ b/substrate/client/chain-spec/src/chain_spec.rs
@@ -20,7 +20,7 @@ use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs::File;
 use std::path::PathBuf;
-use std::rc::Rc;
+use std::sync::Arc;
 use serde::{Serialize, Deserialize};
 use sp_core::storage::{StorageKey, StorageData, ChildInfo, Storage, StorageChild};
 use sp_runtime::BuildStorage;
@@ -32,7 +32,7 @@ use sc_telemetry::TelemetryEndpoints;
 enum GenesisSource<G> {
 	File(PathBuf),
 	Binary(Cow<'static, [u8]>),
-	Factory(Rc<dyn Fn() -> G>),
+	Factory(Arc<dyn Fn() -> G + Send + Sync>),
 }
 
 impl<G> Clone for GenesisSource<G> {
@@ -215,7 +215,7 @@ impl<G, E> ChainSpec<G, E> {
 	}
 
 	/// Create hardcoded spec.
-	pub fn from_genesis<F: Fn() -> G + 'static>(
+	pub fn from_genesis<F: Fn() -> G + 'static + Send + Sync>(
 		name: &str,
 		id: &str,
 		constructor: F,
@@ -239,7 +239,7 @@ impl<G, E> ChainSpec<G, E> {
 
 		ChainSpec {
 			client_spec,
-			genesis: GenesisSource::Factory(Rc::new(constructor)),
+			genesis: GenesisSource::Factory(Arc::new(constructor)),
 		}
 	}
 }