merged two different CTRange structs

client/api/src/backend.rs

@@ -18,7 +18,7 @@
 
 use std::sync::Arc;
 use std::collections::HashMap;
-use sp_core::ChangesTrieConfiguration;
+use sp_core::ChangesTrieConfigurationRange;
 use sp_core::offchain::OffchainStorage;
 use sp_runtime::{generic::BlockId, Justification, Storage};
 use sp_runtime::traits::{Block as BlockT, NumberFor};
@@ -311,25 +311,16 @@ pub trait Backend<Block, H>: AuxStore + Send + Sync where
 	fn get_import_lock(&self) -> &RwLock<()>;
 }
 
-/// Changes trie configuration range.
-#[derive(Debug)]
-pub struct ChangesTrieConfigurationRange<Block: BlockT> {
-	/// Zero block of this configuration. First trie that uses this configuration is build at the next block.
-	pub zero: (NumberFor<Block>, Block::Hash),
-	/// End block where last trie that uses this configuration has been build. None if configuration is active.
-	pub end: Option<(NumberFor<Block>, Block::Hash)>,
-	/// Configuration itself. None if changes tries are disabled within this range.
-	pub config: Option<ChangesTrieConfiguration>,
-}
-
 /// Changes trie storage that supports pruning.
 pub trait PrunableStateChangesTrieStorage<Block: BlockT, H: Hasher>:
 	StateChangesTrieStorage<H, NumberFor<Block>>
 {
 	/// Get reference to StateChangesTrieStorage.
 	fn storage(&self) -> &dyn StateChangesTrieStorage<H, NumberFor<Block>>;
 	/// Get configuration at given block.
-	fn configuration_at(&self, at: &BlockId<Block>) -> sp_blockchain::Result<ChangesTrieConfigurationRange<Block>>;
+	fn configuration_at(&self, at: &BlockId<Block>) -> sp_blockchain::Result<
+		ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>
+	>;
 	/// Get end block (inclusive) of oldest pruned max-level (or skewed) digest trie blocks range.
 	/// It is guaranteed that we have no any changes tries before (and including) this block.
 	/// It is guaranteed that all existing changes tries after this block are not yet pruned (if created).

client/api/src/light.rs

@@ -26,7 +26,7 @@ use sp_runtime::{
     },
     generic::BlockId
 };
-use sp_core::ChangesTrieConfiguration;
+use sp_core::ChangesTrieConfigurationRange;
 use sp_state_machine::StorageProof;
 use sp_blockchain::{
 	HeaderMetadata, well_known_cache_keys, HeaderBackend, Cache as BlockchainCache,
@@ -96,7 +96,7 @@ pub struct RemoteReadChildRequest<Header: HeaderT> {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct RemoteChangesRequest<Header: HeaderT> {
 	/// All changes trie configurations that are valid within [first_block; last_block].
-	pub changes_trie_configs: Vec<(Header::Number, Option<Header::Number>, ChangesTrieConfiguration)>,
+	pub changes_trie_configs: Vec<ChangesTrieConfigurationRange<Header::Number, Header::Hash>>,
 	/// Query changes from range of blocks, starting (and including) with this hash...
 	pub first_block: (Header::Number, Header::Hash),
 	/// ...ending (and including) with this hash. Should come after first_block and

client/db/src/changes_tries_storage.rs

@@ -24,9 +24,9 @@ use codec::{Decode, Encode};
 use parking_lot::RwLock;
 use sp_blockchain::{Error as ClientError, Result as ClientResult};
 use sp_trie::MemoryDB;
-use sc_client_api::backend::{PrunableStateChangesTrieStorage, ChangesTrieConfigurationRange};
+use sc_client_api::backend::PrunableStateChangesTrieStorage;
 use sp_blockchain::{well_known_cache_keys, Cache as BlockchainCache};
-use sp_core::{H256, Blake2Hasher, ChangesTrieConfiguration, convert_hash};
+use sp_core::{H256, Blake2Hasher, ChangesTrieConfiguration, ChangesTrieConfigurationRange, convert_hash};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, One, Zero, CheckedSub,
 };
@@ -385,7 +385,9 @@ where
 		self
 	}
 
-	fn configuration_at(&self, at: &BlockId<Block>) -> ClientResult<ChangesTrieConfigurationRange<Block>> {
+	fn configuration_at(&self, at: &BlockId<Block>) -> ClientResult<
+		ChangesTrieConfigurationRange<NumberFor<Block>, Block::Hash>
+	> {
 		self.cache
 			.get_at(&well_known_cache_keys::CHANGES_TRIE_CONFIG, at)?
 			.and_then(|(zero, end, encoded)| Decode::decode(&mut &encoded[..]).ok()

client/network/src/protocol/light_dispatch.rs

@@ -1092,7 +1092,11 @@ pub mod tests {
 
 		let (tx, response) = oneshot::channel();
 		light_dispatch.add_request(&mut network_interface, RequestData::RemoteChanges(RemoteChangesRequest {
-			changes_trie_configs: vec![(0, None, sp_core::ChangesTrieConfiguration::new(4, 2))],
+			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+				zero: (0, Default::default()),
+				end: None,
+				config: Some(sp_core::ChangesTrieConfiguration::new(4, 2)),
+			}],
 			first_block: (1, Default::default()),
 			last_block: (100, Default::default()),
 			max_block: (100, Default::default()),

client/src/light/fetcher.rs

@@ -116,14 +116,13 @@ impl<E, H, B: BlockT, S: BlockchainStorage<B>> LightDataChecker<E, H, B, S> {
 		// and now check the key changes proof + get the changes
 		let mut result = Vec::new();
 		let proof_storage = InMemoryChangesTrieStorage::with_proof(remote_proof);
-		for (config_zero, config_end, config) in &request.changes_trie_configs {
-			let config_range = ChangesTrieConfigurationRange {
-				config,
-				zero: config_zero.clone(),
-				end: config_end.clone(),
-			};
+		for config_range in &request.changes_trie_configs {
 			let result_range = key_changes_proof_check_with_db::<H, _>(
-				config_range,
+				ChangesTrieConfigurationRange {
+					config: config_range.config.as_ref().ok_or(ClientError::ChangesTriesNotSupported)?,
+					zero: config_range.zero.0,
+					end: config_range.end.map(|(n, _)| n),
+				},
 				&RootsStorage {
 					roots: (request.tries_roots.0, &request.tries_roots.2),
 					prev_roots: &remote_roots,
@@ -572,7 +571,11 @@ pub mod tests {
 			let local_roots_range = local_roots.clone()[(begin - 1) as usize..].to_vec();
 			let config = ChangesTrieConfiguration::new(4, 2);
 			let request = RemoteChangesRequest::<Header> {
-				changes_trie_configs: vec![(0, None, config)],
+				changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+					zero: (0, Default::default()),
+					end: None,
+					config: Some(config),
+				}],
 				first_block: (begin, begin_hash),
 				last_block: (end, end_hash),
 				max_block: (max, max_hash),
@@ -628,7 +631,11 @@ pub mod tests {
 		// check proof on local client
 		let config = ChangesTrieConfiguration::new(4, 2);
 		let request = RemoteChangesRequest::<Header> {
-			changes_trie_configs: vec![(0, None, config)],
+			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+				zero: (0, Default::default()),
+				end: None,
+				config: Some(config),
+			}],
 			first_block: (1, b1),
 			last_block: (4, b4),
 			max_block: (4, b4),
@@ -670,7 +677,11 @@ pub mod tests {
 		let local_roots_range = local_roots.clone()[(begin - 1) as usize..].to_vec();
 		let config = ChangesTrieConfiguration::new(4, 2);
 		let request = RemoteChangesRequest::<Header> {
-			changes_trie_configs: vec![(0, None, config)],
+			changes_trie_configs: vec![sp_core::ChangesTrieConfigurationRange {
+				zero: (0, Default::default()),
+				end: None,
+				config: Some(config),
+			}],
 			first_block: (begin, begin_hash),
 			last_block: (end, end_hash),
 			max_block: (max, max_hash),

primitives/core/src/changes_trie.rs

@@ -38,6 +38,17 @@ pub struct ChangesTrieConfiguration {
 	pub digest_levels: u32,
 }
 
+/// Substrate changes trie configuration range.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ChangesTrieConfigurationRange<Number, Hash> {
+	/// Zero block of configuration.
+	pub zero: (Number, Hash),
+	/// Last block of configuration (if configuration has been deactivated at some point).
+	pub end: Option<(Number, Hash)>,
+	/// The configuration itself. None if changes tries were disabled in this range.
+	pub config: Option<ChangesTrieConfiguration>,
+}
+
 impl ChangesTrieConfiguration {
 	/// Create new configuration given digest interval and levels.
 	pub fn new(digest_interval: u32, digest_levels: u32) -> Self {

primitives/core/src/lib.rs

@@ -75,7 +75,7 @@ mod tests;
 
 pub use self::hash::{H160, H256, H512, convert_hash};
 pub use self::uint::U256;
-pub use changes_trie::ChangesTrieConfiguration;
+pub use changes_trie::{ChangesTrieConfiguration, ChangesTrieConfigurationRange};
 #[cfg(feature = "full_crypto")]
 pub use crypto::{DeriveJunction, Pair, Public};