pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 09:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor storage hashing away from opaque types (#903)

Browse Source 
* Refactor storage of various modules.

* The real list of claims

* Migration away from opaque maps

* Fix

* Fix for task executor API change
This commit is contained in:
Gavin Wood
2020-03-17 11:54:13 +01:00
committed by GitHub
parent 260b2fa336
commit a9a1034af5
12 changed files with 173 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/common/src/claims.rs
+25 -6
View File
@@ -25,7 +25,9 @@ use system::{ensure_root, ensure_none};
use codec::{Encode, Decode};
#[cfg(feature = "std")]
use serde::{self, Serialize, Deserialize, Serializer, Deserializer};
use sp_runtime::traits::{Zero, CheckedSub};
#[cfg(feature = "std")]
use sp_runtime::traits::Zero;
use sp_runtime::traits::CheckedSub;
use sp_runtime::{
RuntimeDebug, transaction_validity::{
TransactionLongevity, TransactionValidity, ValidTransaction, InvalidTransaction
@@ -122,7 +124,7 @@ decl_storage! {
trait Store for Module<T: Trait> as Claims {
Claims get(claims) build(|config: &GenesisConfig<T>| {
config.claims.iter().map(|(a, b)| (a.clone(), b.clone())).collect::<Vec<_>>()
}): map hasher(blake2_256) EthereumAddress => Option<BalanceOf<T>>;
}): map hasher(identity) EthereumAddress => Option<BalanceOf<T>>;
Total get(total) build(|config: &GenesisConfig<T>| {
config.claims.iter().fold(Zero::zero(), |acc: BalanceOf<T>, &(_, n)| acc + n)
}): BalanceOf<T>;
@@ -131,7 +133,7 @@ decl_storage! {
/// Second balance is how much should be unlocked per block.
/// The block number is when the vesting should start.
Vesting get(vesting) config():
map hasher(blake2_256) EthereumAddress
map hasher(identity) EthereumAddress
=> Option<(BalanceOf<T>, BalanceOf<T>, T::BlockNumber)>;
}
add_extra_genesis {
@@ -139,6 +141,19 @@ decl_storage! {
}
}
mod migration {
use super::*;
pub fn migrate<T: Trait>() {
if let Ok(addresses) = Vec::<EthereumAddress>::decode(&mut &include_bytes!("./claims.scale")[..]) {
for i in &addresses {
Vesting::<T>::migrate_key_from_blake(i);
Claims::<T>::migrate_key_from_blake(i);
}
}
}
}
decl_module! {
pub struct Module<T: Trait> for enum Call where origin: T::Origin {
type Error = Error<T>;
@@ -149,6 +164,10 @@ decl_module! {
/// Deposit one of this module's events by using the default implementation.
fn deposit_event() = default;
fn on_runtime_upgrade() {
migration::migrate::<T>();
}
/// Make a claim to collect your DOTs.
///
/// The dispatch origin for this call must be _None_.
@@ -393,7 +412,7 @@ mod tests {
type Version = ();
type ModuleToIndex = ();
type AccountData = balances::AccountData<u64>;
type OnNewAccount = ();
type MigrateAccount = (); type OnNewAccount = ();
type OnKilledAccount = Balances;
}
@@ -681,7 +700,7 @@ mod benchmarking {
let vesting = Some((100_000.into(), 1_000.into(), 100.into()));
}: _(RawOrigin::Root, account, VALUE.into(), vesting)
// Benchmark the time it takes to execute `validate_unsigned`
// Benchmark the time it takes to execute `validate_unsigned`
validate_unsigned {
let c in ...;
// Crate signature
@@ -703,7 +722,7 @@ mod benchmarking {
}
}
// Benchmark the time it takes to do `repeat` number of `eth_recover`
// Benchmark the time it takes to do `repeat` number of `eth_recover`
eth_recover {
let i in 0 .. 1_000;
// Crate signature