Pruning changes trie without digests (#952)

* pruning changes tries without digests

* u64::max_value()
This commit is contained in:
Svyatoslav Nikolsky
2018-11-17 20:04:53 +03:00
committed by Gav Wood
parent 5b28147d27
commit 6f9a505fba
30 changed files with 257 additions and 315 deletions
-1
View File
@@ -104,7 +104,6 @@ impl ExtBuilder {
transfer_fee: self.transfer_fee,
creation_fee: self.creation_fee,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.into()
}
-1
View File
@@ -54,7 +54,6 @@ pub fn new_test_ext(authorities: Vec<u64>) -> runtime_io::TestExternalities<Blak
t.extend(GenesisConfig::<Test>{
code: vec![],
authorities,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.into()
}
-2
View File
@@ -131,7 +131,6 @@ impl ExtBuilder {
transfer_fee: self.transfer_fee,
creation_fee: self.creation_fee,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage()
.unwrap().0,
);
@@ -144,7 +143,6 @@ impl ExtBuilder {
max_depth: 100,
block_gas_limit: self.block_gas_limit,
current_schedule: Default::default(),
_genesis_phantom_data: Default::default(),
}.build_storage()
.unwrap().0,
);
-4
View File
@@ -122,13 +122,11 @@ mod tests {
transfer_fee: 0,
creation_fee: 0,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(democracy::GenesisConfig::<Test>{
launch_period: 1,
voting_period: 3,
minimum_deposit: 1,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(seats::GenesisConfig::<Test> {
candidacy_bond: 9,
@@ -145,12 +143,10 @@ mod tests {
presentation_duration: 2,
desired_seats: 2,
term_duration: 5,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(voting::GenesisConfig::<Test> {
cooloff_period: 2,
voting_period: 1,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
runtime_io::TestExternalities::new(t)
}
-2
View File
@@ -358,13 +358,11 @@ mod tests {
transfer_fee: 0,
creation_fee: 0,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test>{
launch_period: 1,
voting_period: 1,
minimum_deposit: 1,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
runtime_io::TestExternalities::new(t)
}
-1
View File
@@ -313,7 +313,6 @@ mod tests {
t.extend(GenesisConfig::<Test>{
dummy: 42,
foo: 24,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.into()
}
-1
View File
@@ -327,7 +327,6 @@ mod tests {
transfer_fee: 0,
creation_fee: 0,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
let xt = primitives::testing::TestXt(Some(1), 0, Call::transfer(2.into(), 69.into()));
let mut t = runtime_io::TestExternalities::<Blake2Hasher>::new(t);
-3
View File
@@ -270,16 +270,13 @@ mod tests {
t.extend(consensus::GenesisConfig::<Test>{
code: vec![],
authorities: vec![1, 2, 3],
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(timestamp::GenesisConfig::<Test>{
period: 5,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test>{
session_length: 2,
validators: vec![1, 2, 3],
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
runtime_io::TestExternalities::new(t)
}
+1 -6
View File
@@ -88,12 +88,10 @@ pub fn new_test_ext(
t.extend(consensus::GenesisConfig::<Test>{
code: vec![],
authorities: vec![],
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(session::GenesisConfig::<Test>{
session_length,
validators: vec![10, 20],
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(balances::GenesisConfig::<Test>{
balances: if monied {
@@ -111,7 +109,6 @@ pub fn new_test_ext(
transfer_fee: 0,
creation_fee: 0,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test>{
sessions_per_era,
@@ -125,11 +122,9 @@ pub fn new_test_ext(
current_session_reward: reward,
current_offline_slash: 20,
offline_slash_grace: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(timestamp::GenesisConfig::<Test>{
period: 5,
_genesis_phantom_data: Default::default(),
period: 5
}.build_storage().unwrap().0);
runtime_io::TestExternalities::new(t)
}
@@ -627,8 +627,6 @@ 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 ,)*
}
@@ -637,7 +635,6 @@ 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 ,)*
}
+1
View File
@@ -201,6 +201,7 @@ decl_storage! {
}
add_extra_genesis {
config(changes_trie_config): Option<ChangesTrieConfiguration>;
config(_phantom): ::std::marker::PhantomData<T>;
build(|storage: &mut primitives::StorageMap, _: &mut primitives::ChildrenStorageMap, config: &GenesisConfig<T>| {
use codec::Encode;
+3 -12
View File
@@ -211,10 +211,7 @@ mod tests {
#[test]
fn timestamp_works() {
let mut t = system::GenesisConfig::<Test>::default().build_storage().unwrap().0;
t.extend(GenesisConfig::<Test> {
period: 5,
_genesis_phantom_data: Default::default()
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test> { period: 0 }.build_storage().unwrap().0);
with_externalities(&mut TestExternalities::new(t), || {
Timestamp::set_timestamp(42);
@@ -227,10 +224,7 @@ mod tests {
#[should_panic(expected = "Timestamp must be updated only once in the block")]
fn double_timestamp_should_fail() {
let mut t = system::GenesisConfig::<Test>::default().build_storage().unwrap().0;
t.extend(GenesisConfig::<Test> {
period: 5,
_genesis_phantom_data: Default::default()
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test> { period: 5 }.build_storage().unwrap().0);
with_externalities(&mut TestExternalities::new(t), || {
Timestamp::set_timestamp(42);
@@ -243,10 +237,7 @@ mod tests {
#[should_panic(expected = "Timestamp must increment by at least <BlockPeriod> between sequential blocks")]
fn block_period_is_enforced() {
let mut t = system::GenesisConfig::<Test>::default().build_storage().unwrap().0;
t.extend(GenesisConfig::<Test> {
period: 5,
_genesis_phantom_data: Default::default()
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test> { period: 5 }.build_storage().unwrap().0);
with_externalities(&mut TestExternalities::new(t), || {
Timestamp::set_timestamp(42);
-2
View File
@@ -330,14 +330,12 @@ mod tests {
creation_fee: 0,
existential_deposit: 0,
reclaim_rebate: 0,
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.extend(GenesisConfig::<Test>{
proposal_bond: Permill::from_percent(5),
proposal_bond_minimum: 1,
spend_period: 2,
burn: Permill::from_percent(50),
_genesis_phantom_data: Default::default(),
}.build_storage().unwrap().0);
t.into()
}