From 482ca522cc28d53d3271bf9685f35b848cf983aa Mon Sep 17 00:00:00 2001
From: Stanislav Tkach <stanislav.tkach@gmail.com>
Date: Fri, 17 Jan 2020 10:20:20 +0200
Subject: [PATCH] Add typedefs for storage types (#4654)
* Add typedefs for storage types
* Fix after merge
---
substrate/client/api/src/backend.rs | 11 ++--
substrate/client/db/src/lib.rs | 7 +--
substrate/client/db/src/storage_cache.rs | 8 +--
substrate/client/src/in_mem.rs | 7 ++-
substrate/client/src/light/backend.rs | 5 +-
.../primitives/state-machine/src/backend.rs | 46 ++++++++---------
.../primitives/state-machine/src/basic.rs | 30 +++++------
.../state-machine/src/changes_trie/build.rs | 26 ++++++----
.../src/changes_trie/build_cache.rs | 22 ++++----
.../state-machine/src/changes_trie/input.rs | 15 +++---
.../state-machine/src/changes_trie/mod.rs | 15 ++++--
.../state-machine/src/changes_trie/storage.rs | 11 ++--
substrate/primitives/state-machine/src/ext.rs | 23 +++++----
.../state-machine/src/in_memory_backend.rs | 44 ++++++++--------
substrate/primitives/state-machine/src/lib.rs | 5 +-
.../state-machine/src/overlayed_changes.rs | 50 ++++++++++++-------
.../primitives/state-machine/src/testing.rs | 3 +-
.../state-machine/src/trie_backend.rs | 22 ++++----
.../state-machine/src/trie_backend_essence.rs | 12 ++---
19 files changed, 202 insertions(+), 160 deletions(-)
diff --git a/substrate/client/api/src/backend.rs b/substrate/client/api/src/backend.rs
index a1bed27a271..a389af5671b 100644
--- a/substrate/client/api/src/backend.rs
+++ b/substrate/client/api/src/backend.rs
@@ -22,7 +22,10 @@ use sp_core::ChangesTrieConfigurationRange;
use sp_core::offchain::OffchainStorage;
use sp_runtime::{generic::BlockId, Justification, Storage};
use sp_runtime::traits::{Block as BlockT, NumberFor, HasherFor};
-use sp_state_machine::{ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction};
+use sp_state_machine::{
+ ChangesTrieState, ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction,
+ StorageCollection, ChildStorageCollection,
+};
use crate::{
blockchain::{
Backend as BlockchainBackend, well_known_cache_keys
@@ -45,12 +48,6 @@ pub type TransactionForSB<B, Block> = <B as StateBackend<HasherFor<Block>>>::Tra
/// Extracts the transaction for the given backend.
pub type TransactionFor<B, Block> = TransactionForSB<StateBackendFor<B, Block>, Block>;
-/// In memory array of storage values.
-pub type StorageCollection = Vec<(Vec<u8>, Option<Vec<u8>>)>;
-
-/// In memory arrays of storage values for multiple child tries.
-pub type ChildStorageCollection = Vec<(Vec<u8>, StorageCollection)>;
-
/// Import operation summary.
///
/// Contains information about the block that just got imported,
diff --git a/substrate/client/db/src/lib.rs b/substrate/client/db/src/lib.rs
index 4038d917a7d..29e17a5f0c7 100644
--- a/substrate/client/db/src/lib.rs
+++ b/substrate/client/db/src/lib.rs
@@ -45,7 +45,7 @@ use std::collections::HashMap;
use sc_client_api::{execution_extensions::ExecutionExtensions, ForkBlocks, UsageInfo, MemoryInfo, BadBlocks, IoInfo};
use sc_client_api::backend::NewBlockState;
-use sc_client_api::backend::{PrunableStateChangesTrieStorage, StorageCollection, ChildStorageCollection};
+use sc_client_api::backend::PrunableStateChangesTrieStorage;
use sp_blockchain::{
Result as ClientResult, Error as ClientError,
well_known_cache_keys, HeaderBackend,
@@ -66,8 +66,9 @@ use sp_runtime::traits::{
};
use sc_executor::RuntimeInfo;
use sp_state_machine::{
- DBValue, ChangesTrieTransaction, ChangesTrieCacheAction,
- backend::Backend as StateBackend, UsageInfo as StateUsageInfo,
+ DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
+ StorageCollection, ChildStorageCollection,
+ backend::Backend as StateBackend,
};
use crate::utils::{DatabaseType, Meta, db_err, meta_keys, read_db, read_meta};
use crate::changes_tries_storage::{DbChangesTrieStorage, DbChangesTrieStorageTransaction};
diff --git a/substrate/client/db/src/storage_cache.rs b/substrate/client/db/src/storage_cache.rs
index 4f7e906a0ae..fd85a899b62 100644
--- a/substrate/client/db/src/storage_cache.rs
+++ b/substrate/client/db/src/storage_cache.rs
@@ -24,17 +24,17 @@ use hash_db::Hasher;
use sp_runtime::traits::{Block as BlockT, Header, HasherFor, NumberFor};
use sp_core::hexdisplay::HexDisplay;
use sp_core::storage::ChildInfo;
-use sp_state_machine::{backend::Backend as StateBackend, TrieBackend};
+use sp_state_machine::{
+ backend::Backend as StateBackend, TrieBackend, StorageKey, StorageValue,
+ StorageCollection, ChildStorageCollection,
+};
use log::trace;
-use sc_client_api::backend::{StorageCollection, ChildStorageCollection};
use std::hash::Hash as StdHash;
use crate::stats::StateUsageStats;
const STATE_CACHE_BLOCKS: usize = 12;
-type StorageKey = Vec<u8>;
type ChildStorageKey = (Vec<u8>, Vec<u8>);
-type StorageValue = Vec<u8>;
/// Shared canonical state cache.
pub struct Cache<B: BlockT> {
diff --git a/substrate/client/src/in_mem.rs b/substrate/client/src/in_mem.rs
index 42a5e90101b..dcff8102aeb 100644
--- a/substrate/client/src/in_mem.rs
+++ b/substrate/client/src/in_mem.rs
@@ -26,11 +26,14 @@ use sp_core::offchain::storage::{
use sp_runtime::generic::BlockId;
use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor, HasherFor};
use sp_runtime::{Justification, Storage};
-use sp_state_machine::{ChangesTrieTransaction, InMemoryBackend, Backend as StateBackend};
+use sp_state_machine::{
+ ChangesTrieTransaction, InMemoryBackend, Backend as StateBackend, StorageCollection,
+ ChildStorageCollection,
+};
use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata};
use sc_client_api::{
- backend::{self, NewBlockState, StorageCollection, ChildStorageCollection},
+ backend::{self, NewBlockState},
blockchain::{
self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId
},
diff --git a/substrate/client/src/light/backend.rs b/substrate/client/src/light/backend.rs
index 2afb269d488..ad9f43587e4 100644
--- a/substrate/client/src/light/backend.rs
+++ b/substrate/client/src/light/backend.rs
@@ -27,7 +27,8 @@ use sp_core::ChangesTrieConfiguration;
use sp_core::storage::{well_known_keys, ChildInfo, OwnedChildInfo};
use sp_core::offchain::storage::InMemOffchainStorage;
use sp_state_machine::{
- Backend as StateBackend, TrieBackend, InMemoryBackend, ChangesTrieTransaction
+ Backend as StateBackend, TrieBackend, InMemoryBackend, ChangesTrieTransaction,
+ StorageCollection, ChildStorageCollection,
};
use sp_runtime::{generic::BlockId, Justification, Storage};
use sp_runtime::traits::{Block as BlockT, NumberFor, Zero, Header, HasherFor};
@@ -36,7 +37,7 @@ use sp_blockchain::{Error as ClientError, Result as ClientResult};
use sc_client_api::{
backend::{
AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState,
- StorageCollection, ChildStorageCollection, PrunableStateChangesTrieStorage,
+ PrunableStateChangesTrieStorage,
},
blockchain::{
HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys,
diff --git a/substrate/primitives/state-machine/src/backend.rs b/substrate/primitives/state-machine/src/backend.rs
index 75733d68b3f..4ef9b970ae2 100644
--- a/substrate/primitives/state-machine/src/backend.rs
+++ b/substrate/primitives/state-machine/src/backend.rs
@@ -26,7 +26,7 @@ use sp_trie::{TrieMut, MemoryDB, trie_types::TrieDBMut};
use crate::{
trie_backend::TrieBackend,
trie_backend_essence::TrieBackendStorage,
- UsageInfo,
+ UsageInfo, StorageKey, StorageValue, StorageCollection,
};
/// A state backend is used to read state data and can have changes committed
@@ -44,7 +44,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
type TrieBackendStorage: TrieBackendStorage<H>;
/// Get keyed storage or None if there is nothing associated.
- fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error>;
+ fn storage(&self, key: &[u8]) -> Result<Option<StorageValue>, Self::Error>;
/// Get keyed storage value hash or None if there is nothing associated.
fn storage_hash(&self, key: &[u8]) -> Result<Option<H::Out>, Self::Error> {
@@ -57,7 +57,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error>;
+ ) -> Result<Option<StorageValue>, Self::Error>;
/// Get child keyed storage value hash or None if there is nothing associated.
fn child_storage_hash(
@@ -85,7 +85,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
}
/// Return the next key in storage in lexicographic order or `None` if there is no value.
- fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error>;
+ fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error>;
/// Return the next key in child storage in lexicographic order or `None` if there is no value.
fn next_child_storage_key(
@@ -93,7 +93,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8]
- ) -> Result<Option<Vec<u8>>, Self::Error>;
+ ) -> Result<Option<StorageKey>, Self::Error>;
/// Retrieve all entries keys of child storage and call `f` for each of those keys.
fn for_keys_in_child_storage<F: FnMut(&[u8])>(
@@ -129,7 +129,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
/// Does not include child storage updates.
fn storage_root<I>(&self, delta: I) -> (H::Out, Self::Transaction)
where
- I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+ I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
H::Out: Ord;
/// Calculate the child storage root, with given delta over what is already stored in
@@ -142,14 +142,14 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
delta: I,
) -> (H::Out, bool, Self::Transaction)
where
- I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+ I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
H::Out: Ord;
/// Get all key/value pairs into a Vec.
- fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)>;
+ fn pairs(&self) -> Vec<(StorageKey, StorageValue)>;
/// Get all keys with given prefix
- fn keys(&self, prefix: &[u8]) -> Vec<Vec<u8>> {
+ fn keys(&self, prefix: &[u8]) -> Vec<StorageKey> {
let mut all = Vec::new();
self.for_keys_with_prefix(prefix, |k| all.push(k.to_vec()));
all
@@ -161,7 +161,7 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
storage_key: &[u8],
child_info: ChildInfo,
prefix: &[u8],
- ) -> Vec<Vec<u8>> {
+ ) -> Vec<StorageKey> {
let mut all = Vec::new();
self.for_child_keys_with_prefix(storage_key, child_info, prefix, |k| all.push(k.to_vec()));
all
@@ -181,9 +181,9 @@ pub trait Backend<H: Hasher>: std::fmt::Debug {
child_deltas: I2)
-> (H::Out, Self::Transaction)
where
- I1: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
- I2i: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
- I2: IntoIterator<Item=(Vec<u8>, I2i, OwnedChildInfo)>,
+ I1: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
+ I2i: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
+ I2: IntoIterator<Item=(StorageKey, I2i, OwnedChildInfo)>,
H::Out: Ord + Encode,
{
let mut txs: Self::Transaction = Default::default();
@@ -220,7 +220,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
type Transaction = T::Transaction;
type TrieBackendStorage = T::TrieBackendStorage;
- fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn storage(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
(*self).storage(key)
}
@@ -229,7 +229,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageKey>, Self::Error> {
(*self).child_storage(storage_key, child_info, key)
}
@@ -242,7 +242,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
(*self).for_keys_in_child_storage(storage_key, child_info, f)
}
- fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
(*self).next_storage_key(key)
}
@@ -251,7 +251,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageKey>, Self::Error> {
(*self).next_child_storage_key(storage_key, child_info, key)
}
@@ -271,7 +271,7 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
fn storage_root<I>(&self, delta: I) -> (H::Out, Self::Transaction)
where
- I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+ I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
H::Out: Ord,
{
(*self).storage_root(delta)
@@ -284,13 +284,13 @@ impl<'a, T: Backend<H>, H: Hasher> Backend<H> for &'a T {
delta: I,
) -> (H::Out, bool, Self::Transaction)
where
- I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+ I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
H::Out: Ord,
{
(*self).child_storage_root(storage_key, child_info, delta)
}
- fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
+ fn pairs(&self) -> Vec<(StorageKey, StorageValue)> {
(*self).pairs()
}
@@ -316,8 +316,8 @@ impl Consolidate for () {
}
impl Consolidate for Vec<(
- Option<(Vec<u8>, OwnedChildInfo)>,
- Vec<(Vec<u8>, Option<Vec<u8>>)>,
+ Option<(StorageKey, OwnedChildInfo)>,
+ StorageCollection,
)> {
fn consolidate(&mut self, mut other: Self) {
self.append(&mut other);
@@ -334,7 +334,7 @@ impl<H: Hasher, KF: sp_trie::KeyFunction<H>> Consolidate for sp_trie::GenericMem
pub(crate) fn insert_into_memory_db<H, I>(mdb: &mut MemoryDB<H>, input: I) -> Option<H::Out>
where
H: Hasher,
- I: IntoIterator<Item=(Vec<u8>, Vec<u8>)>,
+ I: IntoIterator<Item=(StorageKey, StorageValue)>,
{
let mut root = <H as Hasher>::Out::default();
{
diff --git a/substrate/primitives/state-machine/src/basic.rs b/substrate/primitives/state-machine/src/basic.rs
index d06aedfc4b6..d905657737a 100644
--- a/substrate/primitives/state-machine/src/basic.rs
+++ b/substrate/primitives/state-machine/src/basic.rs
@@ -19,7 +19,7 @@
use std::{
collections::BTreeMap, any::{TypeId, Any}, iter::FromIterator, ops::Bound
};
-use crate::{Backend, InMemoryBackend};
+use crate::{Backend, InMemoryBackend, StorageKey, StorageValue};
use hash_db::Hasher;
use sp_trie::{TrieConfiguration, default_child_trie_root};
use sp_trie::trie_types::Layout;
@@ -46,7 +46,7 @@ impl BasicExternalities {
}
/// Insert key/value
- pub fn insert(&mut self, k: Vec<u8>, v: Vec<u8>) -> Option<Vec<u8>> {
+ pub fn insert(&mut self, k: StorageKey, v: StorageValue) -> Option<StorageValue> {
self.inner.top.insert(k, v)
}
@@ -89,8 +89,8 @@ impl PartialEq for BasicExternalities {
}
}
-impl FromIterator<(Vec<u8>, Vec<u8>)> for BasicExternalities {
- fn from_iter<I: IntoIterator<Item=(Vec<u8>, Vec<u8>)>>(iter: I) -> Self {
+impl FromIterator<(StorageKey, StorageValue)> for BasicExternalities {
+ fn from_iter<I: IntoIterator<Item=(StorageKey, StorageValue)>>(iter: I) -> Self {
let mut t = Self::default();
t.inner.top.extend(iter);
t
@@ -101,8 +101,8 @@ impl Default for BasicExternalities {
fn default() -> Self { Self::new(Default::default()) }
}
-impl From<BTreeMap<Vec<u8>, Vec<u8>>> for BasicExternalities {
- fn from(hashmap: BTreeMap<Vec<u8>, Vec<u8>>) -> Self {
+impl From<BTreeMap<StorageKey, StorageValue>> for BasicExternalities {
+ fn from(hashmap: BTreeMap<StorageKey, StorageValue>) -> Self {
BasicExternalities { inner: Storage {
top: hashmap,
children: Default::default(),
@@ -111,7 +111,7 @@ impl From<BTreeMap<Vec<u8>, Vec<u8>>> for BasicExternalities {
}
impl Externalities for BasicExternalities {
- fn storage(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn storage(&self, key: &[u8]) -> Option<StorageValue> {
self.inner.top.get(key).cloned()
}
@@ -119,7 +119,7 @@ impl Externalities for BasicExternalities {
self.storage(key).map(|v| Blake2Hasher::hash(&v).encode())
}
- fn original_storage(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn original_storage(&self, key: &[u8]) -> Option<StorageValue> {
self.storage(key)
}
@@ -132,7 +132,7 @@ impl Externalities for BasicExternalities {
storage_key: ChildStorageKey,
_child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageValue> {
self.inner.children.get(storage_key.as_ref()).and_then(|child| child.data.get(key)).cloned()
}
@@ -159,11 +159,11 @@ impl Externalities for BasicExternalities {
storage_key: ChildStorageKey,
child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageValue> {
Externalities::child_storage(self, storage_key, child_info, key)
}
- fn next_storage_key(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn next_storage_key(&self, key: &[u8]) -> Option<StorageKey> {
let range = (Bound::Excluded(key), Bound::Unbounded);
self.inner.top.range::<[u8], _>(range).next().map(|(k, _)| k).cloned()
}
@@ -173,13 +173,13 @@ impl Externalities for BasicExternalities {
storage_key: ChildStorageKey,
_child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageKey> {
let range = (Bound::Excluded(key), Bound::Unbounded);
self.inner.children.get(storage_key.as_ref())
.and_then(|child| child.data.range::<[u8], _>(range).next().map(|(k, _)| k).cloned())
}
- fn place_storage(&mut self, key: Vec<u8>, maybe_value: Option<Vec<u8>>) {
+ fn place_storage(&mut self, key: StorageKey, maybe_value: Option<StorageValue>) {
if is_child_storage_key(&key) {
warn!(target: "trie", "Refuse to set child storage key via main storage");
return;
@@ -195,8 +195,8 @@ impl Externalities for BasicExternalities {
&mut self,
storage_key: ChildStorageKey,
child_info: ChildInfo,
- key: Vec<u8>,
- value: Option<Vec<u8>>,
+ key: StorageKey,
+ value: Option<StorageValue>,
) {
let child_map = self.inner.children.entry(storage_key.into_owned())
.or_insert_with(|| StorageChild {
diff --git a/substrate/primitives/state-machine/src/changes_trie/build.rs b/substrate/primitives/state-machine/src/changes_trie/build.rs
index f717a1e6e3c..c731d4104b2 100644
--- a/substrate/primitives/state-machine/src/changes_trie/build.rs
+++ b/substrate/primitives/state-machine/src/changes_trie/build.rs
@@ -21,13 +21,17 @@ use std::collections::btree_map::Entry;
use codec::{Decode, Encode};
use hash_db::Hasher;
use num_traits::One;
-use crate::backend::Backend;
-use crate::overlayed_changes::OverlayedChanges;
-use crate::trie_backend_essence::TrieBackendEssence;
-use crate::changes_trie::build_iterator::digest_build_iterator;
-use crate::changes_trie::input::{InputKey, InputPair, DigestIndex, ExtrinsicIndex};
-use crate::changes_trie::{AnchorBlockId, ConfigurationRange, Storage, BlockNumber};
-use crate::changes_trie::input::ChildIndex;
+use crate::{
+ StorageKey,
+ backend::Backend,
+ overlayed_changes::OverlayedChanges,
+ trie_backend_essence::TrieBackendEssence,
+ changes_trie::{
+ AnchorBlockId, ConfigurationRange, Storage, BlockNumber,
+ build_iterator::digest_build_iterator,
+ input::{InputKey, InputPair, DigestIndex, ExtrinsicIndex, ChildIndex},
+ },
+};
/// Prepare input pairs for building a changes trie of given block.
///
@@ -101,7 +105,7 @@ fn prepare_extrinsics_input<'a, B, H, Number>(
Number: BlockNumber,
{
- let mut children_keys = BTreeSet::<Vec<u8>>::new();
+ let mut children_keys = BTreeSet::<StorageKey>::new();
let mut children_result = BTreeMap::new();
for (storage_key, _) in changes.prospective.children.iter()
.chain(changes.committed.children.iter()) {
@@ -126,7 +130,7 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
backend: &'a B,
block: &Number,
changes: &'a OverlayedChanges,
- storage_key: Option<Vec<u8>>,
+ storage_key: Option<StorageKey>,
) -> Result<impl Iterator<Item=InputPair<Number>> + 'a, String>
where
B: Backend<H>,
@@ -231,7 +235,7 @@ fn prepare_digest_input<'a, H, Number>(
let trie_root = storage.root(parent, digest_build_block.clone())?;
let trie_root = trie_root.ok_or_else(|| format!("No changes trie root for block {}", digest_build_block.clone()))?;
- let insert_to_map = |map: &mut BTreeMap<_,_>, key: Vec<u8>| {
+ let insert_to_map = |map: &mut BTreeMap<_,_>, key: StorageKey| {
match map.entry(key.clone()) {
Entry::Vacant(entry) => {
entry.insert((DigestIndex {
@@ -277,7 +281,7 @@ fn prepare_digest_input<'a, H, Number>(
return Ok((map, child_map));
}
- let mut children_roots = BTreeMap::<Vec<u8>, _>::new();
+ let mut children_roots = BTreeMap::<StorageKey, _>::new();
{
let trie_storage = TrieBackendEssence::<_, H>::new(
crate::changes_trie::TrieBackendStorageAdapter(storage),
diff --git a/substrate/primitives/state-machine/src/changes_trie/build_cache.rs b/substrate/primitives/state-machine/src/changes_trie/build_cache.rs
index 76e3652e166..9d0dbb4c1f3 100644
--- a/substrate/primitives/state-machine/src/changes_trie/build_cache.rs
+++ b/substrate/primitives/state-machine/src/changes_trie/build_cache.rs
@@ -18,6 +18,8 @@
use std::collections::{HashMap, HashSet};
+use crate::StorageKey;
+
/// Changes trie build cache.
///
/// Helps to avoid read of changes tries from the database when digest trie
@@ -36,7 +38,7 @@ pub struct BuildCache<H, N> {
/// The `Option<Vec<u8>>` in inner `HashMap` stands for the child storage key.
/// If it is `None`, then the `HashSet` contains keys changed in top-level storage.
/// If it is `Some`, then the `HashSet` contains keys changed in child storage, identified by the key.
- changed_keys: HashMap<H, HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>>,
+ changed_keys: HashMap<H, HashMap<Option<StorageKey>, HashSet<StorageKey>>>,
}
/// The action to perform when block-with-changes-trie is imported.
@@ -54,7 +56,7 @@ pub struct CachedBuildData<H, N> {
block: N,
trie_root: H,
digest_input_blocks: Vec<N>,
- changed_keys: HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>,
+ changed_keys: HashMap<Option<StorageKey>, HashSet<StorageKey>>,
}
/// The action to perform when block-with-changes-trie is imported.
@@ -70,7 +72,7 @@ pub(crate) enum IncompleteCacheAction<N> {
#[derive(Debug, PartialEq)]
pub(crate) struct IncompleteCachedBuildData<N> {
digest_input_blocks: Vec<N>,
- changed_keys: HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>,
+ changed_keys: HashMap<Option<StorageKey>, HashSet<StorageKey>>,
}
impl<H, N> BuildCache<H, N>
@@ -87,7 +89,7 @@ impl<H, N> BuildCache<H, N>
}
/// Get cached changed keys for changes trie with given root.
- pub fn get(&self, root: &H) -> Option<&HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>> {
+ pub fn get(&self, root: &H) -> Option<&HashMap<Option<StorageKey>, HashSet<StorageKey>>> {
self.changed_keys.get(&root)
}
@@ -96,7 +98,7 @@ impl<H, N> BuildCache<H, N>
pub fn with_changed_keys(
&self,
root: &H,
- functor: &mut dyn FnMut(&HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>),
+ functor: &mut dyn FnMut(&HashMap<Option<StorageKey>, HashSet<StorageKey>>),
) -> bool {
match self.changed_keys.get(&root) {
Some(changed_keys) => {
@@ -162,8 +164,8 @@ impl<N> IncompleteCacheAction<N> {
/// Insert changed keys of given storage into cached data.
pub(crate) fn insert(
self,
- storage_key: Option<Vec<u8>>,
- changed_keys: HashSet<Vec<u8>>,
+ storage_key: Option<StorageKey>,
+ changed_keys: HashSet<StorageKey>,
) -> Self {
match self {
IncompleteCacheAction::CacheBuildData(build_data) =>
@@ -198,8 +200,8 @@ impl<N> IncompleteCachedBuildData<N> {
fn insert(
mut self,
- storage_key: Option<Vec<u8>>,
- changed_keys: HashSet<Vec<u8>>,
+ storage_key: Option<StorageKey>,
+ changed_keys: HashSet<StorageKey>,
) -> Self {
self.changed_keys.insert(storage_key, changed_keys);
self
@@ -259,4 +261,4 @@ mod tests {
assert_eq!(cache.changed_keys.len(), 0);
}
-}
\ No newline at end of file
+}
diff --git a/substrate/primitives/state-machine/src/changes_trie/input.rs b/substrate/primitives/state-machine/src/changes_trie/input.rs
index 9b3341ca584..4a1420f8486 100644
--- a/substrate/primitives/state-machine/src/changes_trie/input.rs
+++ b/substrate/primitives/state-machine/src/changes_trie/input.rs
@@ -17,7 +17,10 @@
//! Different types of changes trie input pairs.
use codec::{Decode, Encode, Input, Output, Error};
-use crate::changes_trie::BlockNumber;
+use crate::{
+ StorageKey, StorageValue,
+ changes_trie::BlockNumber
+};
/// Key of { changed key => set of extrinsic indices } mapping.
#[derive(Clone, Debug, PartialEq, Eq)]
@@ -25,7 +28,7 @@ pub struct ExtrinsicIndex<Number: BlockNumber> {
/// Block at which this key has been inserted in the trie.
pub block: Number,
/// Storage key this node is responsible for.
- pub key: Vec<u8>,
+ pub key: StorageKey,
}
/// Value of { changed key => set of extrinsic indices } mapping.
@@ -37,7 +40,7 @@ pub struct DigestIndex<Number: BlockNumber> {
/// Block at which this key has been inserted in the trie.
pub block: Number,
/// Storage key this node is responsible for.
- pub key: Vec<u8>,
+ pub key: StorageKey,
}
/// Key of { childtrie key => Childchange trie } mapping.
@@ -46,7 +49,7 @@ pub struct ChildIndex<Number: BlockNumber> {
/// Block at which this key has been inserted in the trie.
pub block: Number,
/// Storage key this node is responsible for.
- pub storage_key: Vec<u8>,
+ pub storage_key: StorageKey,
}
/// Value of { changed key => block/digest block numbers } mapping.
@@ -89,8 +92,8 @@ impl<Number: BlockNumber> InputPair<Number> {
}
}
-impl<Number: BlockNumber> Into<(Vec<u8>, Vec<u8>)> for InputPair<Number> {
- fn into(self) -> (Vec<u8>, Vec<u8>) {
+impl<Number: BlockNumber> Into<(StorageKey, StorageValue)> for InputPair<Number> {
+ fn into(self) -> (StorageKey, StorageValue) {
match self {
InputPair::ExtrinsicIndex(key, value) => (key.encode(), value.encode()),
InputPair::DigestIndex(key, value) => (key.encode(), value.encode()),
diff --git a/substrate/primitives/state-machine/src/changes_trie/mod.rs b/substrate/primitives/state-machine/src/changes_trie/mod.rs
index 3fc98caf790..12074b7261a 100644
--- a/substrate/primitives/state-machine/src/changes_trie/mod.rs
+++ b/substrate/primitives/state-machine/src/changes_trie/mod.rs
@@ -68,15 +68,20 @@ pub use self::prune::prune;
use std::collections::{HashMap, HashSet};
use std::convert::TryInto;
use hash_db::{Hasher, Prefix};
-use crate::backend::Backend;
use num_traits::{One, Zero};
use codec::{Decode, Encode};
use sp_core;
-use crate::changes_trie::build::prepare_input;
-use crate::changes_trie::build_cache::{IncompleteCachedBuildData, IncompleteCacheAction};
-use crate::overlayed_changes::OverlayedChanges;
use sp_trie::{MemoryDB, DBValue, TrieMut};
use sp_trie::trie_types::TrieDBMut;
+use crate::{
+ StorageKey,
+ backend::Backend,
+ overlayed_changes::OverlayedChanges,
+ changes_trie::{
+ build::prepare_input,
+ build_cache::{IncompleteCachedBuildData, IncompleteCacheAction},
+ },
+};
/// Changes that are made outside of extrinsics are marked with this index;
pub const NO_EXTRINSIC_INDEX: u32 = 0xffffffff;
@@ -151,7 +156,7 @@ pub trait Storage<H: Hasher, Number: BlockNumber>: RootsStorage<H, Number> {
fn with_cached_changed_keys(
&self,
root: &H::Out,
- functor: &mut dyn FnMut(&HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>),
+ functor: &mut dyn FnMut(&HashMap<Option<StorageKey>, HashSet<StorageKey>>),
) -> bool;
/// Get a trie node.
fn get(&self, key: &H::Out, prefix: Prefix) -> Result<Option<DBValue>, String>;
diff --git a/substrate/primitives/state-machine/src/changes_trie/storage.rs b/substrate/primitives/state-machine/src/changes_trie/storage.rs
index 163ea7f4122..7fb41867287 100644
--- a/substrate/primitives/state-machine/src/changes_trie/storage.rs
+++ b/substrate/primitives/state-machine/src/changes_trie/storage.rs
@@ -21,8 +21,11 @@ use hash_db::{Hasher, Prefix, EMPTY_PREFIX};
use sp_trie::DBValue;
use sp_trie::MemoryDB;
use parking_lot::RwLock;
-use crate::changes_trie::{BuildCache, RootsStorage, Storage, AnchorBlockId, BlockNumber};
-use crate::trie_backend_essence::TrieBackendStorage;
+use crate::{
+ StorageKey,
+ trie_backend_essence::TrieBackendStorage,
+ changes_trie::{BuildCache, RootsStorage, Storage, AnchorBlockId, BlockNumber},
+};
#[cfg(test)]
use crate::backend::insert_into_memory_db;
@@ -93,7 +96,7 @@ impl<H: Hasher, Number: BlockNumber> InMemoryStorage<H, Number> {
#[cfg(test)]
pub fn with_inputs(
mut top_inputs: Vec<(Number, Vec<InputPair<Number>>)>,
- children_inputs: Vec<(Vec<u8>, Vec<(Number, Vec<InputPair<Number>>)>)>,
+ children_inputs: Vec<(StorageKey, Vec<(Number, Vec<InputPair<Number>>)>)>,
) -> Self {
let mut mdb = MemoryDB::default();
let mut roots = BTreeMap::new();
@@ -179,7 +182,7 @@ impl<H: Hasher, Number: BlockNumber> Storage<H, Number> for InMemoryStorage<H, N
fn with_cached_changed_keys(
&self,
root: &H::Out,
- functor: &mut dyn FnMut(&HashMap<Option<Vec<u8>>, HashSet<Vec<u8>>>),
+ functor: &mut dyn FnMut(&HashMap<Option<StorageKey>, HashSet<StorageKey>>),
) -> bool {
self.cache.with_changed_keys(root, functor)
}
diff --git a/substrate/primitives/state-machine/src/ext.rs b/substrate/primitives/state-machine/src/ext.rs
index 3ee7292102f..f293ae9f516 100644
--- a/substrate/primitives/state-machine/src/ext.rs
+++ b/substrate/primitives/state-machine/src/ext.rs
@@ -17,7 +17,8 @@
//! Concrete externalities implementation.
use crate::{
- backend::Backend, OverlayedChanges, StorageTransactionCache,
+ StorageKey, StorageValue, OverlayedChanges, StorageTransactionCache,
+ backend::Backend,
changes_trie::State as ChangesTrieState,
};
@@ -130,7 +131,7 @@ where
B: 'a + Backend<H>,
N: crate::changes_trie::BlockNumber,
{
- pub fn storage_pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
+ pub fn storage_pairs(&self) -> Vec<(StorageKey, StorageValue)> {
use std::collections::HashMap;
self.backend.pairs().iter()
@@ -151,7 +152,7 @@ where
B: 'a + Backend<H>,
N: crate::changes_trie::BlockNumber,
{
- fn storage(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn storage(&self, key: &[u8]) -> Option<StorageValue> {
let _guard = sp_panic_handler::AbortGuard::force_abort();
let result = self.overlay.storage(key).map(|x| x.map(|x| x.to_vec())).unwrap_or_else(||
self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL));
@@ -178,7 +179,7 @@ where
result.map(|r| r.encode())
}
- fn original_storage(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn original_storage(&self, key: &[u8]) -> Option<StorageValue> {
let _guard = sp_panic_handler::AbortGuard::force_abort();
let result = self.backend.storage(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
@@ -207,7 +208,7 @@ where
storage_key: ChildStorageKey,
child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageValue> {
let _guard = sp_panic_handler::AbortGuard::force_abort();
let result = self.overlay
.child_storage(storage_key.as_ref(), key)
@@ -256,7 +257,7 @@ where
storage_key: ChildStorageKey,
child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageValue> {
let _guard = sp_panic_handler::AbortGuard::force_abort();
let result = self.backend
.child_storage(storage_key.as_ref(), child_info, key)
@@ -332,7 +333,7 @@ where
result
}
- fn next_storage_key(&self, key: &[u8]) -> Option<Vec<u8>> {
+ fn next_storage_key(&self, key: &[u8]) -> Option<StorageKey> {
let next_backend_key = self.backend.next_storage_key(key).expect(EXT_NOT_ALLOWED_TO_FAIL);
let next_overlay_key_change = self.overlay.next_storage_key_change(key);
@@ -352,7 +353,7 @@ where
storage_key: ChildStorageKey,
child_info: ChildInfo,
key: &[u8],
- ) -> Option<Vec<u8>> {
+ ) -> Option<StorageKey> {
let next_backend_key = self.backend
.next_child_storage_key(storage_key.as_ref(), child_info, key)
.expect(EXT_NOT_ALLOWED_TO_FAIL);
@@ -376,7 +377,7 @@ where
}
}
- fn place_storage(&mut self, key: Vec<u8>, value: Option<Vec<u8>>) {
+ fn place_storage(&mut self, key: StorageKey, value: Option<StorageValue>) {
trace!(target: "state-trace", "{:04x}: Put {}={:?}",
self.id,
HexDisplay::from(&key),
@@ -396,8 +397,8 @@ where
&mut self,
storage_key: ChildStorageKey,
child_info: ChildInfo,
- key: Vec<u8>,
- value: Option<Vec<u8>>,
+ key: StorageKey,
+ value: Option<StorageValue>,
) {
trace!(target: "state-trace", "{:04x}: PutChild({}) {}={:?}",
self.id,
diff --git a/substrate/primitives/state-machine/src/in_memory_backend.rs b/substrate/primitives/state-machine/src/in_memory_backend.rs
index ae1a214a72c..0a29468bbc4 100644
--- a/substrate/primitives/state-machine/src/in_memory_backend.rs
+++ b/substrate/primitives/state-machine/src/in_memory_backend.rs
@@ -16,7 +16,11 @@
//! State machine in memory backend.
-use crate::{trie_backend::TrieBackend, backend::{Backend, insert_into_memory_db}};
+use crate::{
+ StorageKey, StorageValue, StorageCollection,
+ trie_backend::TrieBackend,
+ backend::{Backend, insert_into_memory_db},
+};
use std::{error, fmt, collections::{BTreeMap, HashMap}, marker::PhantomData, ops};
use hash_db::Hasher;
use sp_trie::{
@@ -43,7 +47,7 @@ impl error::Error for Void {
/// In-memory backend. Fully recomputes tries each time `as_trie_backend` is called but useful for
/// tests and proof checking.
pub struct InMemory<H: Hasher> {
- inner: HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>, Vec<u8>>>,
+ inner: HashMap<Option<(StorageKey, OwnedChildInfo)>, BTreeMap<StorageKey, StorageValue>>,
// This field is only needed for returning reference in `as_trie_backend`.
trie: Option<TrieBackend<MemoryDB<H>, H>>,
_hasher: PhantomData<H>,
@@ -84,7 +88,7 @@ impl<H: Hasher> PartialEq for InMemory<H> {
impl<H: Hasher> InMemory<H> {
/// Copy the state, with applied updates
pub fn update<
- T: IntoIterator<Item = (Option<(Vec<u8>, OwnedChildInfo)>, Vec<(Vec<u8>, Option<Vec<u8>>)>)>
+ T: IntoIterator<Item = (Option<(StorageKey, OwnedChildInfo)>, StorageCollection)>
>(
&self,
changes: T,
@@ -103,10 +107,10 @@ impl<H: Hasher> InMemory<H> {
}
}
-impl<H: Hasher> From<HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>, Vec<u8>>>>
+impl<H: Hasher> From<HashMap<Option<(StorageKey, OwnedChildInfo)>, BTreeMap<StorageKey, StorageValue>>>
for InMemory<H>
{
- fn from(inner: HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>, Vec<u8>>>) -> Self {
+ fn from(inner: HashMap<Option<(StorageKey, OwnedChildInfo)>, BTreeMap<StorageKey, StorageValue>>) -> Self {
InMemory {
inner,
trie: None,
@@ -117,7 +121,7 @@ impl<H: Hasher> From<HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>
impl<H: Hasher> From<Storage> for InMemory<H> {
fn from(inners: Storage) -> Self {
- let mut inner: HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>, Vec<u8>>>
+ let mut inner: HashMap<Option<(StorageKey, OwnedChildInfo)>, BTreeMap<StorageKey, StorageValue>>
= inners.children.into_iter().map(|(k, c)| (Some((k, c.child_info)), c.data)).collect();
inner.insert(None, inners.top);
InMemory {
@@ -128,8 +132,8 @@ impl<H: Hasher> From<Storage> for InMemory<H> {
}
}
-impl<H: Hasher> From<BTreeMap<Vec<u8>, Vec<u8>>> for InMemory<H> {
- fn from(inner: BTreeMap<Vec<u8>, Vec<u8>>) -> Self {
+impl<H: Hasher> From<BTreeMap<StorageKey, StorageValue>> for InMemory<H> {
+ fn from(inner: BTreeMap<StorageKey, StorageValue>) -> Self {
let mut expanded = HashMap::new();
expanded.insert(None, inner);
InMemory {
@@ -140,12 +144,12 @@ impl<H: Hasher> From<BTreeMap<Vec<u8>, Vec<u8>>> for InMemory<H> {
}
}
-impl<H: Hasher> From<Vec<(Option<(Vec<u8>, OwnedChildInfo)>, Vec<(Vec<u8>, Option<Vec<u8>>)>)>>
+impl<H: Hasher> From<Vec<(Option<(StorageKey, OwnedChildInfo)>, StorageCollection)>>
for InMemory<H> {
fn from(
- inner: Vec<(Option<(Vec<u8>, OwnedChildInfo)>, Vec<(Vec<u8>, Option<Vec<u8>>)>)>,
+ inner: Vec<(Option<(StorageKey, OwnedChildInfo)>, StorageCollection)>,
) -> Self {
- let mut expanded: HashMap<Option<(Vec<u8>, OwnedChildInfo)>, BTreeMap<Vec<u8>, Vec<u8>>>
+ let mut expanded: HashMap<Option<(StorageKey, OwnedChildInfo)>, BTreeMap<StorageKey, StorageValue>>
= HashMap::new();
for (child_info, key_values) in inner {
let entry = expanded.entry(child_info).or_default();
@@ -171,12 +175,12 @@ impl<H: Hasher> InMemory<H> {
impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
type Error = Void;
type Transaction = Vec<(
- Option<(Vec<u8>, OwnedChildInfo)>,
- Vec<(Vec<u8>, Option<Vec<u8>>)>,
+ Option<(StorageKey, OwnedChildInfo)>,
+ StorageCollection,
)>;
type TrieBackendStorage = MemoryDB<H>;
- fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn storage(&self, key: &[u8]) -> Result<Option<StorageValue>, Self::Error> {
Ok(self.inner.get(&None).and_then(|map| map.get(key).map(Clone::clone)))
}
@@ -185,7 +189,7 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageValue>, Self::Error> {
Ok(self.inner.get(&Some((storage_key.to_vec(), child_info.to_owned())))
.and_then(|map| map.get(key).map(Clone::clone)))
}
@@ -279,7 +283,7 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
(root, is_default, vec![(child_info, full_transaction)])
}
- fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
let range = (ops::Bound::Excluded(key), ops::Bound::Unbounded);
let next_key = self.inner.get(&None)
.and_then(|map| map.range::<[u8], _>(range).next().map(|(k, _)| k).cloned());
@@ -292,7 +296,7 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageKey>, Self::Error> {
let range = (ops::Bound::Excluded(key), ops::Bound::Unbounded);
let next_key = self.inner.get(&Some((storage_key.to_vec(), child_info.to_owned())))
.and_then(|map| map.range::<[u8], _>(range).next().map(|(k, _)| k).cloned());
@@ -300,14 +304,14 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
Ok(next_key)
}
- fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
+ fn pairs(&self) -> Vec<(StorageKey, StorageValue)> {
self.inner.get(&None)
.into_iter()
.flat_map(|map| map.iter().map(|(k, v)| (k.clone(), v.clone())))
.collect()
}
- fn keys(&self, prefix: &[u8]) -> Vec<Vec<u8>> {
+ fn keys(&self, prefix: &[u8]) -> Vec<StorageKey> {
self.inner.get(&None)
.into_iter()
.flat_map(|map| map.keys().filter(|k| k.starts_with(prefix)).cloned())
@@ -319,7 +323,7 @@ impl<H: Hasher> Backend<H> for InMemory<H> where H::Out: Codec {
storage_key: &[u8],
child_info: ChildInfo,
prefix: &[u8],
- ) -> Vec<Vec<u8>> {
+ ) -> Vec<StorageKey> {
self.inner.get(&Some((storage_key.to_vec(), child_info.to_owned())))
.into_iter()
.flat_map(|map| map.keys().filter(|k| k.starts_with(prefix)).cloned())
diff --git a/substrate/primitives/state-machine/src/lib.rs b/substrate/primitives/state-machine/src/lib.rs
index b27bf47050f..bb62df6da49 100644
--- a/substrate/primitives/state-machine/src/lib.rs
+++ b/substrate/primitives/state-machine/src/lib.rs
@@ -62,7 +62,10 @@ pub use changes_trie::{
disabled_state as disabled_changes_trie_state,
BlockNumber as ChangesTrieBlockNumber,
};
-pub use overlayed_changes::{OverlayedChanges, StorageChanges, StorageTransactionCache};
+pub use overlayed_changes::{
+ OverlayedChanges, StorageChanges, StorageTransactionCache, StorageKey, StorageValue,
+ StorageCollection, ChildStorageCollection,
+};
pub use proving_backend::{
create_proof_check_backend, create_proof_check_backend_storage, merge_storage_proofs,
ProofRecorder, ProvingBackend, ProvingBackendRecorder, StorageProof,
diff --git a/substrate/primitives/state-machine/src/overlayed_changes.rs b/substrate/primitives/state-machine/src/overlayed_changes.rs
index 6c41ed06ef0..ed6f30a4f59 100644
--- a/substrate/primitives/state-machine/src/overlayed_changes.rs
+++ b/substrate/primitives/state-machine/src/overlayed_changes.rs
@@ -33,6 +33,18 @@ use std::{mem, ops};
use hash_db::Hasher;
+/// Storage key.
+pub type StorageKey = Vec<u8>;
+
+/// Storage value.
+pub type StorageValue = Vec<u8>;
+
+/// In memory array of storage values.
+pub type StorageCollection = Vec<(StorageKey, Option<StorageValue>)>;
+
+/// In memory arrays of storage values for multiple child tries.
+pub type ChildStorageCollection = Vec<(StorageKey, StorageCollection)>;
+
/// The overlayed changes to state to be queried on top of the backend.
///
/// A transaction shares all prospective changes within an inner overlay
@@ -52,7 +64,7 @@ pub struct OverlayedChanges {
#[cfg_attr(test, derive(PartialEq))]
pub struct OverlayedValue {
/// Current value. None if value has been deleted.
- pub value: Option<Vec<u8>>,
+ pub value: Option<StorageValue>,
/// The set of extinsic indices where the values has been changed.
/// Is filled only if runtime has announced changes trie support.
pub extrinsics: Option<BTreeSet<u32>>,
@@ -63,9 +75,9 @@ pub struct OverlayedValue {
#[cfg_attr(test, derive(PartialEq))]
pub struct OverlayedChangeSet {
/// Top level storage changes.
- pub top: BTreeMap<Vec<u8>, OverlayedValue>,
+ pub top: BTreeMap<StorageKey, OverlayedValue>,
/// Child storage changes.
- pub children: HashMap<Vec<u8>, (BTreeMap<Vec<u8>, OverlayedValue>, OwnedChildInfo)>,
+ pub children: HashMap<StorageKey, (BTreeMap<StorageKey, OverlayedValue>, OwnedChildInfo)>,
}
/// A storage changes structure that can be generated by the data collected in [`OverlayedChanges`].
@@ -76,9 +88,9 @@ pub struct StorageChanges<Transaction, H: Hasher, N: BlockNumber> {
/// All changes to the main storage.
///
/// A value of `None` means that it was deleted.
- pub main_storage_changes: Vec<(Vec<u8>, Option<Vec<u8>>)>,
+ pub main_storage_changes: StorageCollection,
/// All changes to the child storages.
- pub child_storage_changes: Vec<(Vec<u8>, Vec<(Vec<u8>, Option<Vec<u8>>)>)>,
+ pub child_storage_changes: ChildStorageCollection,
/// A transaction for the backend that contains all changes from
/// [`main_storage_changes`](Self::main_storage_changes) and from
/// [`child_storage_changes`](Self::child_storage_changes).
@@ -94,8 +106,8 @@ pub struct StorageChanges<Transaction, H: Hasher, N: BlockNumber> {
impl<Transaction, H: Hasher, N: BlockNumber> StorageChanges<Transaction, H, N> {
/// Deconstruct into the inner values
pub fn into_inner(self) -> (
- Vec<(Vec<u8>, Option<Vec<u8>>)>,
- Vec<(Vec<u8>, Vec<(Vec<u8>, Option<Vec<u8>>)>)>,
+ StorageCollection,
+ ChildStorageCollection,
Transaction,
H::Out,
Option<ChangesTrieTransaction<H, N>>,
@@ -155,8 +167,8 @@ impl<Transaction: Default, H: Hasher, N: BlockNumber> Default for StorageChanges
}
#[cfg(test)]
-impl FromIterator<(Vec<u8>, OverlayedValue)> for OverlayedChangeSet {
- fn from_iter<T: IntoIterator<Item = (Vec<u8>, OverlayedValue)>>(iter: T) -> Self {
+impl FromIterator<(StorageKey, OverlayedValue)> for OverlayedChangeSet {
+ fn from_iter<T: IntoIterator<Item = (StorageKey, OverlayedValue)>>(iter: T) -> Self {
Self {
top: iter.into_iter().collect(),
children: Default::default(),
@@ -219,7 +231,7 @@ impl OverlayedChanges {
/// Inserts the given key-value pair into the prospective change set.
///
/// `None` can be used to delete a value specified by the given key.
- pub(crate) fn set_storage(&mut self, key: Vec<u8>, val: Option<Vec<u8>>) {
+ pub(crate) fn set_storage(&mut self, key: StorageKey, val: Option<StorageValue>) {
let extrinsic_index = self.extrinsic_index();
let entry = self.prospective.top.entry(key).or_default();
entry.value = val;
@@ -235,10 +247,10 @@ impl OverlayedChanges {
/// `None` can be used to delete a value specified by the given key.
pub(crate) fn set_child_storage(
&mut self,
- storage_key: Vec<u8>,
+ storage_key: StorageKey,
child_info: ChildInfo,
- key: Vec<u8>,
- val: Option<Vec<u8>>,
+ key: StorageKey,
+ val: Option<StorageValue>,
) {
let extrinsic_index = self.extrinsic_index();
let map_entry = self.prospective.children.entry(storage_key)
@@ -417,8 +429,8 @@ impl OverlayedChanges {
/// Panics:
/// Will panic if there are any uncommitted prospective changes.
pub fn into_committed(self) -> (
- impl Iterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
- impl Iterator<Item=(Vec<u8>, (impl Iterator<Item=(Vec<u8>, Option<Vec<u8>>)>, OwnedChildInfo))>,
+ impl Iterator<Item=(StorageKey, Option<StorageValue>)>,
+ impl Iterator<Item=(StorageKey, (impl Iterator<Item=(StorageKey, Option<StorageValue>)>, OwnedChildInfo))>,
){
assert!(self.prospective.is_empty());
(
@@ -631,8 +643,8 @@ impl OverlayedChanges {
}
#[cfg(test)]
-impl From<Option<Vec<u8>>> for OverlayedValue {
- fn from(value: Option<Vec<u8>>) -> OverlayedValue {
+impl From<Option<StorageValue>> for OverlayedValue {
+ fn from(value: Option<StorageValue>) -> OverlayedValue {
OverlayedValue { value, ..Default::default() }
}
}
@@ -647,8 +659,8 @@ mod tests {
use crate::ext::Ext;
use super::*;
- fn strip_extrinsic_index(map: &BTreeMap<Vec<u8>, OverlayedValue>)
- -> BTreeMap<Vec<u8>, OverlayedValue>
+ fn strip_extrinsic_index(map: &BTreeMap<StorageKey, OverlayedValue>)
+ -> BTreeMap<StorageKey, OverlayedValue>
{
let mut clone = map.clone();
clone.remove(&EXTRINSIC_INDEX.to_vec());
diff --git a/substrate/primitives/state-machine/src/testing.rs b/substrate/primitives/state-machine/src/testing.rs
index 450919088a4..39a34509b72 100644
--- a/substrate/primitives/state-machine/src/testing.rs
+++ b/substrate/primitives/state-machine/src/testing.rs
@@ -21,6 +21,7 @@ use codec::Decode;
use hash_db::Hasher;
use crate::{
backend::Backend, OverlayedChanges, StorageTransactionCache, ext::Ext, InMemoryBackend,
+ StorageKey, StorageValue,
changes_trie::{
Configuration as ChangesTrieConfiguration,
InMemoryStorage as ChangesTrieInMemoryStorage,
@@ -104,7 +105,7 @@ impl<H: Hasher, N: ChangesTrieBlockNumber> TestExternalities<H, N>
}
/// Insert key/value into backend
- pub fn insert(&mut self, k: Vec<u8>, v: Vec<u8>) {
+ pub fn insert(&mut self, k: StorageKey, v: StorageValue) {
self.backend = self.backend.update(vec![(None, vec![(k, Some(v))])]);
}
diff --git a/substrate/primitives/state-machine/src/trie_backend.rs b/substrate/primitives/state-machine/src/trie_backend.rs
index 1920ea40a88..dbaae323c09 100644
--- a/substrate/primitives/state-machine/src/trie_backend.rs
+++ b/substrate/primitives/state-machine/src/trie_backend.rs
@@ -20,10 +20,12 @@ use log::{warn, debug};
use hash_db::Hasher;
use sp_trie::{Trie, delta_trie_root, default_child_trie_root, child_delta_trie_root};
use sp_trie::trie_types::{TrieDB, TrieError, Layout};
-use crate::trie_backend_essence::{TrieBackendEssence, TrieBackendStorage, Ephemeral};
-use crate::Backend;
use sp_core::storage::ChildInfo;
use codec::{Codec, Decode};
+use crate::{
+ StorageKey, StorageValue, Backend,
+ trie_backend_essence::{TrieBackendEssence, TrieBackendStorage, Ephemeral},
+};
/// Patricia trie-based backend. Transaction type is an overlay of changes to commit.
pub struct TrieBackend<S: TrieBackendStorage<H>, H: Hasher> {
@@ -72,7 +74,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
type Transaction = S::Overlay;
type TrieBackendStorage = S;
- fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn storage(&self, key: &[u8]) -> Result<Option<StorageValue>, Self::Error> {
self.essence.storage(key)
}
@@ -81,11 +83,11 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageValue>, Self::Error> {
self.essence.child_storage(storage_key, child_info, key)
}
- fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
+ fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, Self::Error> {
self.essence.next_storage_key(key)
}
@@ -94,7 +96,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, Self::Error> {
+ ) -> Result<Option<StorageKey>, Self::Error> {
self.essence.next_child_storage_key(storage_key, child_info, key)
}
@@ -125,7 +127,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
self.essence.for_child_keys_with_prefix(storage_key, child_info, prefix, f)
}
- fn pairs(&self) -> Vec<(Vec<u8>, Vec<u8>)> {
+ fn pairs(&self) -> Vec<(StorageKey, StorageValue)> {
let mut read_overlay = S::Overlay::default();
let eph = Ephemeral::new(self.essence.backend_storage(), &mut read_overlay);
@@ -149,7 +151,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
}
}
- fn keys(&self, prefix: &[u8]) -> Vec<Vec<u8>> {
+ fn keys(&self, prefix: &[u8]) -> Vec<StorageKey> {
let mut read_overlay = S::Overlay::default();
let eph = Ephemeral::new(self.essence.backend_storage(), &mut read_overlay);
@@ -170,7 +172,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
}
fn storage_root<I>(&self, delta: I) -> (H::Out, S::Overlay)
- where I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>
+ where I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>
{
let mut write_overlay = S::Overlay::default();
let mut root = *self.essence.root();
@@ -197,7 +199,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> Backend<H> for TrieBackend<S, H> where
delta: I,
) -> (H::Out, bool, Self::Transaction)
where
- I: IntoIterator<Item=(Vec<u8>, Option<Vec<u8>>)>,
+ I: IntoIterator<Item=(StorageKey, Option<StorageValue>)>,
H::Out: Ord,
{
let default_root = default_child_trie_root::<Layout<H>>(storage_key);
diff --git a/substrate/primitives/state-machine/src/trie_backend_essence.rs b/substrate/primitives/state-machine/src/trie_backend_essence.rs
index f7f5006f41d..2598682ae06 100644
--- a/substrate/primitives/state-machine/src/trie_backend_essence.rs
+++ b/substrate/primitives/state-machine/src/trie_backend_essence.rs
@@ -25,7 +25,7 @@ use sp_trie::{Trie, MemoryDB, PrefixedMemoryDB, DBValue,
default_child_trie_root, read_trie_value, read_child_trie_value,
for_keys_in_child_trie, KeySpacedDB};
use sp_trie::trie_types::{TrieDB, TrieError, Layout};
-use crate::backend::Consolidate;
+use crate::{backend::Consolidate, StorageKey, StorageValue};
use sp_core::storage::ChildInfo;
use codec::Encode;
@@ -67,7 +67,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
/// Return the next key in the trie i.e. the minimum key that is strictly superior to `key` in
/// lexicographic order.
- pub fn next_storage_key(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
+ pub fn next_storage_key(&self, key: &[u8]) -> Result<Option<StorageKey>, String> {
self.next_storage_key_from_root(&self.root, None, key)
}
@@ -78,7 +78,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, String> {
+ ) -> Result<Option<StorageKey>, String> {
let child_root = match self.storage(storage_key)? {
Some(child_root) => child_root,
None => return Ok(None),
@@ -101,7 +101,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
root: &H::Out,
child_info: Option<ChildInfo>,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, String> {
+ ) -> Result<Option<StorageKey>, String> {
let mut read_overlay = S::Overlay::default();
let eph = Ephemeral {
storage: &self.storage,
@@ -146,7 +146,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
}
/// Get the value of storage at given key.
- pub fn storage(&self, key: &[u8]) -> Result<Option<Vec<u8>>, String> {
+ pub fn storage(&self, key: &[u8]) -> Result<Option<StorageValue>, String> {
let mut read_overlay = S::Overlay::default();
let eph = Ephemeral {
storage: &self.storage,
@@ -164,7 +164,7 @@ impl<S: TrieBackendStorage<H>, H: Hasher> TrieBackendEssence<S, H> where H::Out:
storage_key: &[u8],
child_info: ChildInfo,
key: &[u8],
- ) -> Result<Option<Vec<u8>>, String> {
+ ) -> Result<Option<StorageValue>, String> {
let root = self.storage(storage_key)?
.unwrap_or(default_child_trie_root::<Layout<H>>(storage_key).encode());
--
GitLab