Fix merge errors and remove ExecutionContext

client/offchain/src/lib.rs

@@ -48,7 +48,7 @@ use sc_network::{NetworkPeers, NetworkStateInfo};
 use sc_transaction_pool_api::OffchainSubmitTransaction;
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_core::{offchain, traits::SpawnNamed};
-use sp_keystore::{KeystoreExt, SyncCryptoStorePtr};
+use sp_keystore::{KeystoreExt, KeystorePtr};
 use sp_runtime::{
 	generic::BlockId,
 	traits::{self, Header},
@@ -101,7 +101,7 @@ pub struct OffchainWorkerOptions<RA, Block: traits::Block, Storage> {
 	/// Provides access to the runtime api.
 	pub runtime_api_provider: Arc<RA>,
 	/// Provides access to the keystore.
-	pub keystore: Option<SyncCryptoStorePtr>,
+	pub keystore: Option<KeystorePtr>,
 	/// Provides access to the offchain database.
 	///
 	/// Use [`NoOffchainStorage`] as type when passing `None` to have some type that works.
@@ -124,7 +124,7 @@ pub struct OffchainWorkers<RA, Block: traits::Block, Storage> {
 	thread_pool: Mutex<ThreadPool>,
 	shared_http_client: api::SharedClient,
 	enable_http_requests: bool,
-	keystore: Option<SyncCryptoStorePtr>,
+	keystore: Option<KeystorePtr>,
 	offchain_db: Option<api::Db<Storage>>,
 	transaction_pool: Option<Arc<dyn OffchainSubmitTransaction<Block>>>,
 	network_provider: Arc<dyn NetworkProvider + Send + Sync>,

client/service/src/client/call_executor.rs

@@ -22,7 +22,7 @@ use sc_client_api::{
 };
 use sc_executor::{RuntimeVersion, RuntimeVersionOf};
 use sp_api::{ProofRecorder, StorageTransactionCache};
-use sp_core::traits::{CallContext, CodeExecutor, RuntimeCode, SpawnNamed};
+use sp_core::traits::{CallContext, CodeExecutor, RuntimeCode};
 use sp_externalities::Extensions;
 use sp_runtime::{generic::BlockId, traits::Block as BlockT};
 use sp_state_machine::{backend::AsTrieBackend, Ext, OverlayedChanges, StateMachine, StorageProof};

primitives/api/proc-macro/src/impl_runtime_apis.rs

@@ -457,7 +457,7 @@ impl<'a> ApiRuntimeImplToApiRuntimeApiImpl<'a> {
 		input.items.push(parse_quote! {
 			fn __runtime_api_internal_call_api_at(
 				&self,
-				at: <__SR_API_BLOCK__ as #crate_::BlockT>::Hash,
+				at: <__SrApiBlock__ as #crate_::BlockT>::Hash,
 				params: std::vec::Vec<u8>,
 				fn_name: &dyn Fn(#crate_::RuntimeVersion) -> &'static str,
 			) -> std::result::Result<std::vec::Vec<u8>, #crate_::ApiError> {

primitives/consensus/common/src/lib.rs

@@ -71,16 +71,6 @@ pub enum BlockOrigin {
 	File,
 }
 
-impl From<BlockOrigin> for sp_core::ExecutionContext {
-	fn from(origin: BlockOrigin) -> Self {
-		if origin == BlockOrigin::NetworkInitialSync {
-			sp_core::ExecutionContext::Syncing
-		} else {
-			sp_core::ExecutionContext::Importing
-		}
-	}
-}
-
 /// Environment for a Consensus instance.
 ///
 /// Creates proposer instance.

primitives/core/src/lib.rs

@@ -92,44 +92,6 @@ pub use sp_storage as storage;
 #[doc(hidden)]
 pub use sp_std;
 
-/// Context for executing a call into the runtime.
-pub enum ExecutionContext {
-	/// Context used for general block import (including locally authored blocks).
-	Importing,
-	/// Context used for importing blocks as part of an initial sync of the blockchain.
-	///
-	/// We distinguish between major sync and import so that validators who are running
-	/// their initial sync (or catching up after some time offline) can use the faster
-	/// native runtime (since we can reasonably assume the network as a whole has already
-	/// come to a broad consensus on the block and it probably hasn't been crafted
-	/// specifically to attack this node), but when importing blocks at the head of the
-	/// chain in normal operation they can use the safer Wasm version.
-	Syncing,
-	/// Context used for block construction.
-	BlockConstruction,
-	/// Context used for offchain calls.
-	///
-	/// This allows passing offchain extension and customizing available capabilities.
-	OffchainCall(Option<(Box<dyn offchain::Externalities>, offchain::Capabilities)>),
-}
-
-impl ExecutionContext {
-	/// Returns the capabilities of particular context.
-	pub fn capabilities(&self) -> offchain::Capabilities {
-		use ExecutionContext::*;
-
-		match self {
-			Importing | Syncing | BlockConstruction => offchain::Capabilities::empty(),
-			// Enable keystore, transaction pool and Offchain DB reads by default for offchain
-			// calls.
-			OffchainCall(None) =>
-				offchain::Capabilities::KEYSTORE |
-					offchain::Capabilities::OFFCHAIN_DB_READ |
-					offchain::Capabilities::TRANSACTION_POOL,
-			OffchainCall(Some((_, capabilities))) => *capabilities,
-		}
-	}
-}
 
 /// Hex-serialized shim for `Vec<u8>`.
 #[derive(PartialEq, Eq, Clone, RuntimeDebug)]