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

client: use appropriate ExecutionContext for initial sync / regular import #6180

Merged
gavofyork merged 10 commits into from
Jun 12, 2020
Merged

client: use appropriate ExecutionContext for initial sync / regular import #6180

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d1bfd90
client: use appropriate ExecutionContext for sync/import
andresilva May 28, 2020
06315f5
client: remove dead code
andresilva May 28, 2020
0fac115
client: ExecutionContext: distinguish between own and foreign imports
andresilva May 28, 2020
1c9a9bd
client: fix cli parameter doc
andresilva May 28, 2020
f6cf8c9
Revert "client: ExecutionContext: distinguish between own and foreign…
andresilva May 29, 2020
816ea63
primitives: add docs for ExecutionContext
andresilva May 29, 2020
e6340b9
cli: execution strategy docs
andresilva May 29, 2020
2715b3e
cli: use different execution context for importing block on validator
andresilva Jun 4, 2020
999bd84
cli: remove defaults from execution context flags
andresilva Jun 4, 2020
b4a98b9
Merge branch 'master' into andre/block-import-execution-context
andresilva Jun 4, 2020
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
18 changes: 10 additions & 8 deletions client/service/src/client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ use parking_lot::{Mutex, RwLock};
use codec::{Encode, Decode};
use hash_db::Prefix;
use sp_core::{
ChangesTrieConfiguration, convert_hash, NativeOrEncoded,
storage::{StorageKey, PrefixedStorageKey, StorageData, well_known_keys, ChildInfo},
convert_hash,
storage::{well_known_keys, ChildInfo, PrefixedStorageKey, StorageData, StorageKey},
ChangesTrieConfiguration, ExecutionContext, NativeOrEncoded,
};
use sc_telemetry::{telemetry, SUBSTRATE_INFO};
use sp_runtime::{
Expand Down Expand Up @@ -754,11 +755,6 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
) = storage_changes.into_inner();

if self.config.offchain_indexing_api {
// if let Some(mut offchain_storage) = self.backend.offchain_storage() {
// offchain_sc.iter().for_each(|(k,v)| {
// offchain_storage.set(b"block-import-info", k,v)
// });
// }
operation.op.update_offchain_storage(offchain_sc)?;
}

Expand Down Expand Up @@ -865,9 +861,15 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
// block.
(true, ref mut storage_changes @ None, Some(ref body)) => {
let runtime_api = self.runtime_api();
let execution_context = if import_block.origin == BlockOrigin::NetworkInitialSync {
ExecutionContext::Syncing
} else {
ExecutionContext::Importing
};

runtime_api.execute_block(
runtime_api.execute_block_with_context(
&at,
execution_context,
Block::new(import_block.header.clone(), body.clone()),
)?;

Expand Down