Revert and redo #952 (#1133)

* Revert "Pruning changes trie without digests (#952)"

This reverts commit 6f9a505fba.

* pruning changes tries without digests

* u64::max_value()

* Update wasm files and fix merge conflict

* Fixes tests
This commit is contained in:
Bastian Köcher
2018-11-18 10:09:18 +01:00
committed by Gav Wood
parent 6f9a505fba
commit d149f3358a
28 changed files with 290 additions and 131 deletions
@@ -627,6 +627,8 @@ macro_rules! __generate_genesis_config {
#[serde(rename_all = "camelCase")]
#[serde(deny_unknown_fields)]
pub struct GenesisConfig<$traitinstance: $traittype> {
#[serde(skip)]
pub _genesis_phantom_data: $crate::storage::generator::PhantomData<$traitinstance>,
$(pub $fieldname : $fieldtype ,)*
$( $(#[$attr])* pub $extrafieldname : $extrafieldty ,)*
}
@@ -635,6 +637,7 @@ macro_rules! __generate_genesis_config {
impl<$traitinstance: $traittype> Default for GenesisConfig<$traitinstance> {
fn default() -> Self {
GenesisConfig {
_genesis_phantom_data: Default::default(),
$($fieldname : $fielddefault ,)*
$($extrafieldname : $extrafielddefault ,)*
}