pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 18:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Child storage tests and genesis fix. (#3185)

Browse Source 
* Using child storage, (srml-support only), test failing .

* fix simple tests.

* Enumerable by requiring owned struct (previous form only allow
&'static).
Broken tests are from genesis init.

* implement for_child_keys_with_prefix

* indent

* clear_child_prefix fix.

* clear_child_prefix fix 2.

* fix for storage_impl, if/when allowing child and not child this could be
reverted.

* Fix lot of urlinked child genesis, still need to look upon actual
genesis srml module code.
Probably still a lot of broken code needing debugging.

* switch well_known_key to their associated module child trie.
Fix a genesis init (balance).
Complete some testing.
Comment some tests before using.

* fixing test runtime child keys

* latest commit fix broken genesis init

* fix system balances child name.

* Important fix: storage_root from test externalities need children (it is
already the case for ext).

* executive root with child calculation

* Avoid empty trie on test ext.

* Symetric removal of key for system.

* commenting changes related tests.

* Remove child module specifics.

* fix issues.

* fix some formatting

* fix bench and bump runtime

* Remove extend_storage_overlays, assimilate_storage do the same as is
proper considering srml macro.

* Fix warning for assimilate.

* Removing kill as they do not impact any test cases.

* Use tuple of storage map instead of two parameters. This changes the
behavior of decl_storage genesis build closure (breaking api).

* Do not use build storage before assimilate.

* fix error

* Update core/state-machine/src/backend.rs
This commit is contained in:
cheme
2019-08-08 15:05:25 +02:00
committed by Gavin Wood
parent 0067b2d9a2
commit b0e1212d48
59 changed files with 523 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/sr-primitives/src/lib.rs
+20 -39
View File
@@ -113,16 +113,14 @@ pub use serde::{Serialize, Deserialize, de::DeserializeOwned};
pub trait BuildStorage: Sized {
/// Build the storage out of this builder.
fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
let mut storage = Default::default();
let mut child_storage = Default::default();
self.assimilate_storage(&mut storage, &mut child_storage)?;
Ok((storage, child_storage))
let mut storage = (Default::default(), Default::default());
self.assimilate_storage(&mut storage)?;
Ok(storage)
}
/// Assimilate the storage for this module into pre-existing overlays.
fn assimilate_storage(
self,
storage: &mut StorageOverlay,
child_storage: &mut ChildrenStorageOverlay
storage: &mut (StorageOverlay, ChildrenStorageOverlay),
) -> Result<(), String>;
}
@@ -132,26 +130,10 @@ pub trait BuildModuleGenesisStorage<T, I>: Sized {
/// Create the module genesis storage into the given `storage` and `child_storage`.
fn build_module_genesis_storage(
self,
storage: &mut StorageOverlay,
child_storage: &mut ChildrenStorageOverlay
storage: &mut (StorageOverlay, ChildrenStorageOverlay),
) -> Result<(), String>;
}
#[cfg(feature = "std")]
impl BuildStorage for StorageOverlay {
fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
Ok((self, Default::default()))
}
fn assimilate_storage(
self,
storage: &mut StorageOverlay,
_child_storage: &mut ChildrenStorageOverlay
) -> Result<(), String> {
storage.extend(self);
Ok(())
}
}
#[cfg(feature = "std")]
impl BuildStorage for (StorageOverlay, ChildrenStorageOverlay) {
fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
@@ -159,11 +141,16 @@ impl BuildStorage for (StorageOverlay, ChildrenStorageOverlay) {
}
fn assimilate_storage(
self,
storage: &mut StorageOverlay,
child_storage: &mut ChildrenStorageOverlay
storage: &mut (StorageOverlay, ChildrenStorageOverlay),
)-> Result<(), String> {
storage.extend(self.0);
child_storage.extend(self.1);
storage.0.extend(self.0);
for (k, other_map) in self.1.into_iter() {
if let Some(map) = storage.1.get_mut(&k) {
map.extend(other_map);
} else {
storage.1.insert(k, other_map);
}
}
Ok(())
}
}
@@ -773,8 +760,7 @@ macro_rules! impl_outer_config {
impl $crate::BuildStorage for $main {
fn assimilate_storage(
self,
top: &mut $crate::StorageOverlay,
children: &mut $crate::ChildrenStorageOverlay
storage: &mut ($crate::StorageOverlay, $crate::ChildrenStorageOverlay),
) -> std::result::Result<(), String> {
$(
if let Some(extra) = self.[< $snake $(_ $instance )? >] {
@@ -784,8 +770,7 @@ macro_rules! impl_outer_config {
$snake;
$( $instance )?;
extra;
top;
children;
storage;
}
}
)*
@@ -799,13 +784,11 @@ macro_rules! impl_outer_config {
$module:ident;
$instance:ident;
$extra:ident;
$top:ident;
$children:ident;
$storage:ident;
) => {
$crate::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
$extra,
$top,
$children,
$storage,
)?;
};
(@CALL_FN
@@ -813,13 +796,11 @@ macro_rules! impl_outer_config {
$module:ident;
;
$extra:ident;
$top:ident;
$children:ident;
$storage:ident;
) => {
$crate::BuildModuleGenesisStorage::<$runtime, $module::__InherentHiddenInstance>::build_module_genesis_storage(
$extra,
$top,
$children,
$storage,
)?;
}
}