mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-27 03:27:58 +00:00
Implement a proper generic resolution in decl_storage! (#2913)
* Add failing test case * move storage maps to blake2_128 (#2268) * remove default hash, introduce twox_128 and blake2 * use blake2_128 & create ext_blake2_128 * refactor code * add benchmark * factorize generator * fix * parameterizable hasher * some fix * fix * fix * fix * metadata * fix * remove debug print * map -> blake2_256 * fix test * fix test * Apply suggestions from code review Co-Authored-By: thiolliere <gui.thiolliere@gmail.com> * impl twox 128 concat (#2353) * impl twox_128_concat * comment addressed * fix * impl twox_128->64_concat * fix test * Fix compilation and cleanup some docs * Lol * Remove traits from storage types that are not generic * Get instance test almost working as wanted * Make `srml-support-test` compile again :) * Fixes test of srml-support * Fix compilation * Break some lines * Remove incorrect macro match arm * Integrates review feedback * Update documentation * Fix compilation
This commit is contained in:
Bastian Köcher
@@ -13,84 +13,22 @@
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#![recursion_limit="128"]
|
||||
|
||||
use runtime_io::{with_externalities, Blake2Hasher};
|
||||
use srml_support::rstd::prelude::*;
|
||||
use srml_support::rstd as rstd;
|
||||
use srml_support::runtime_primitives::{generic, BuildStorage};
|
||||
use srml_support::runtime_primitives::traits::{BlakeTwo256, Block as _, Verify};
|
||||
use srml_support::Parameter;
|
||||
use srml_support::{
|
||||
Parameter,
|
||||
runtime_primitives::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}},
|
||||
};
|
||||
use inherents::{
|
||||
ProvideInherent, InherentData, InherentIdentifier, RuntimeString, MakeFatalError
|
||||
};
|
||||
use srml_support::{StorageValue, StorageMap, StorageDoubleMap};
|
||||
use primitives::{H256, sr25519};
|
||||
|
||||
pub trait Currency {
|
||||
}
|
||||
mod system;
|
||||
|
||||
// Mock
|
||||
mod system {
|
||||
use super::*;
|
||||
|
||||
pub trait Trait: 'static + Eq + Clone {
|
||||
type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
|
||||
+ From<RawOrigin<Self::AccountId>>;
|
||||
type BlockNumber;
|
||||
type Hash;
|
||||
type AccountId;
|
||||
type Event: From<Event>;
|
||||
}
|
||||
|
||||
pub type DigestItemOf<T> = generic::DigestItem<<T as Trait>::Hash>;
|
||||
|
||||
srml_support::decl_module! {
|
||||
pub struct Module<T: Trait> for enum Call where origin: T::Origin {
|
||||
pub fn deposit_event(_event: T::Event) {
|
||||
}
|
||||
}
|
||||
}
|
||||
impl<T: Trait> Module<T> {
|
||||
pub fn deposit_log(_item: DigestItemOf<T>) {
|
||||
unimplemented!();
|
||||
}
|
||||
}
|
||||
|
||||
srml_support::decl_event!(
|
||||
pub enum Event {
|
||||
ExtrinsicSuccess,
|
||||
ExtrinsicFailed,
|
||||
}
|
||||
);
|
||||
|
||||
/// Origin for the system module.
|
||||
#[derive(PartialEq, Eq, Clone)]
|
||||
#[cfg_attr(feature = "std", derive(Debug))]
|
||||
pub enum RawOrigin<AccountId> {
|
||||
Root,
|
||||
Signed(AccountId),
|
||||
None,
|
||||
}
|
||||
|
||||
impl<AccountId> From<Option<AccountId>> for RawOrigin<AccountId> {
|
||||
fn from(s: Option<AccountId>) -> RawOrigin<AccountId> {
|
||||
match s {
|
||||
Some(who) => RawOrigin::Signed(who),
|
||||
None => RawOrigin::None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub type Origin<T> = RawOrigin<<T as Trait>::AccountId>;
|
||||
|
||||
pub fn ensure_root<OuterOrigin, AccountId>(o: OuterOrigin) -> Result<(), &'static str>
|
||||
where OuterOrigin: Into<Result<RawOrigin<AccountId>, OuterOrigin>>
|
||||
{
|
||||
o.into().map(|_| ()).map_err(|_| "bad origin: expected to be a root origin")
|
||||
}
|
||||
}
|
||||
pub trait Currency {}
|
||||
|
||||
// Test for:
|
||||
// * No default instance
|
||||
@@ -123,7 +61,7 @@ mod module1 {
|
||||
}
|
||||
|
||||
srml_support::decl_event! {
|
||||
pub enum Event<T, I> where Phantom = rstd::marker::PhantomData<T> {
|
||||
pub enum Event<T, I> where Phantom = std::marker::PhantomData<T> {
|
||||
_Phantom(Phantom),
|
||||
AnotherVariant(u32),
|
||||
}
|
||||
@@ -133,7 +71,7 @@ mod module1 {
|
||||
#[cfg_attr(feature = "std", derive(Debug))]
|
||||
pub enum Origin<T: Trait<I>, I> {
|
||||
Members(u32),
|
||||
_Phantom(rstd::marker::PhantomData<(T, I)>),
|
||||
_Phantom(std::marker::PhantomData<(T, I)>),
|
||||
}
|
||||
|
||||
pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
|
||||
@@ -147,7 +85,7 @@ mod module1 {
|
||||
unimplemented!();
|
||||
}
|
||||
|
||||
fn check_inherent(_call: &Self::Call, _data: &InherentData) -> rstd::result::Result<(), Self::Error> {
|
||||
fn check_inherent(_call: &Self::Call, _data: &InherentData) -> std::result::Result<(), Self::Error> {
|
||||
unimplemented!();
|
||||
}
|
||||
}
|
||||
@@ -180,7 +118,6 @@ mod module2 {
|
||||
pub LinkedMap config(linked_map): linked_map u64 => u64;
|
||||
pub DoubleMap config(double_map): double_map u64, blake2_256(u64) => u64;
|
||||
}
|
||||
extra_genesis_skip_phantom_data_field;
|
||||
}
|
||||
|
||||
srml_support::decl_event! {
|
||||
@@ -193,7 +130,7 @@ mod module2 {
|
||||
#[cfg_attr(feature = "std", derive(Debug))]
|
||||
pub enum Origin<T: Trait<I>, I=DefaultInstance> {
|
||||
Members(u32),
|
||||
_Phantom(rstd::marker::PhantomData<(T, I)>),
|
||||
_Phantom(std::marker::PhantomData<(T, I)>),
|
||||
}
|
||||
|
||||
pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"12345678";
|
||||
@@ -207,7 +144,7 @@ mod module2 {
|
||||
unimplemented!();
|
||||
}
|
||||
|
||||
fn check_inherent(_call: &Self::Call, _data: &InherentData) -> rstd::result::Result<(), Self::Error> {
|
||||
fn check_inherent(_call: &Self::Call, _data: &InherentData) -> std::result::Result<(), Self::Error> {
|
||||
unimplemented!();
|
||||
}
|
||||
}
|
||||
@@ -224,8 +161,7 @@ mod module3 {
|
||||
}
|
||||
|
||||
srml_support::decl_module! {
|
||||
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {
|
||||
}
|
||||
pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,12 +218,22 @@ srml_support::construct_runtime!(
|
||||
UncheckedExtrinsic = UncheckedExtrinsic
|
||||
{
|
||||
System: system::{Module, Call, Event},
|
||||
Module1_1: module1::<Instance1>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>, Inherent},
|
||||
Module1_2: module1::<Instance2>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>, Inherent},
|
||||
Module1_1: module1::<Instance1>::{
|
||||
Module, Call, Storage, Event<T>, Config, Origin<T>, Inherent
|
||||
},
|
||||
Module1_2: module1::<Instance2>::{
|
||||
Module, Call, Storage, Event<T>, Config, Origin<T>, Inherent
|
||||
},
|
||||
Module2: module2::{Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent},
|
||||
Module2_1: module2::<Instance1>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>, Inherent},
|
||||
Module2_2: module2::<Instance2>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>, Inherent},
|
||||
Module2_3: module2::<Instance3>::{Module, Call, Storage, Event<T, I>, Config<T, I>, Origin<T, I>, Inherent},
|
||||
Module2_1: module2::<Instance1>::{
|
||||
Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
|
||||
},
|
||||
Module2_2: module2::<Instance2>::{
|
||||
Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
|
||||
},
|
||||
Module2_3: module2::<Instance3>::{
|
||||
Module, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
|
||||
},
|
||||
Module3: module3::{Module, Call},
|
||||
}
|
||||
);
|
||||
@@ -300,11 +246,9 @@ fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
|
||||
GenesisConfig{
|
||||
module1_Instance1: Some(module1::GenesisConfig {
|
||||
value: 3,
|
||||
.. Default::default()
|
||||
}),
|
||||
module1_Instance2: Some(module1::GenesisConfig {
|
||||
value: 4,
|
||||
_genesis_phantom_data: Default::default(),
|
||||
}),
|
||||
module2: Some(module2::GenesisConfig {
|
||||
value: 4,
|
||||
@@ -326,48 +270,48 @@ fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
|
||||
#[test]
|
||||
fn storage_instance_independance() {
|
||||
with_externalities(&mut new_test_ext(), || {
|
||||
let mut map = rstd::collections::btree_map::BTreeMap::new();
|
||||
let mut map = std::collections::btree_map::BTreeMap::new();
|
||||
for key in [
|
||||
module2::Value::<Runtime>::key().to_vec(),
|
||||
module2::Value::<Runtime, module2::Instance1>::key().to_vec(),
|
||||
module2::Value::<Runtime, module2::Instance2>::key().to_vec(),
|
||||
module2::Value::<Runtime, module2::Instance3>::key().to_vec(),
|
||||
module2::Map::<Runtime>::prefix().to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance1>::prefix().to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance2>::prefix().to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance3>::prefix().to_vec(),
|
||||
module2::LinkedMap::<Runtime>::prefix().to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance1>::prefix().to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance2>::prefix().to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance3>::prefix().to_vec(),
|
||||
module2::DoubleMap::<Runtime>::prefix().to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance1>::prefix().to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance2>::prefix().to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance3>::prefix().to_vec(),
|
||||
module2::Map::<Runtime>::key_for(0),
|
||||
module2::Map::<Runtime, module2::Instance1>::key_for(0).to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance2>::key_for(0).to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance3>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<Runtime>::key_for(0),
|
||||
module2::LinkedMap::<Runtime, module2::Instance1>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance2>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance3>::key_for(0).to_vec(),
|
||||
module2::Map::<Runtime>::key_for(1),
|
||||
module2::Map::<Runtime, module2::Instance1>::key_for(1).to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance2>::key_for(1).to_vec(),
|
||||
module2::Map::<Runtime, module2::Instance3>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<Runtime>::key_for(1),
|
||||
module2::LinkedMap::<Runtime, module2::Instance1>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance2>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<Runtime, module2::Instance3>::key_for(1).to_vec(),
|
||||
module2::DoubleMap::<Runtime>::prefix_for(1),
|
||||
module2::DoubleMap::<Runtime, module2::Instance1>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance2>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance3>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<Runtime>::key_for(1, 1),
|
||||
module2::DoubleMap::<Runtime, module2::Instance1>::key_for(1, 1).to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance2>::key_for(1, 1).to_vec(),
|
||||
module2::DoubleMap::<Runtime, module2::Instance3>::key_for(1, 1).to_vec(),
|
||||
module2::Map::<module2::DefaultInstance>::prefix().to_vec(),
|
||||
module2::Map::<module2::Instance1>::prefix().to_vec(),
|
||||
module2::Map::<module2::Instance2>::prefix().to_vec(),
|
||||
module2::Map::<module2::Instance3>::prefix().to_vec(),
|
||||
module2::LinkedMap::<module2::DefaultInstance>::prefix().to_vec(),
|
||||
module2::LinkedMap::<module2::Instance1>::prefix().to_vec(),
|
||||
module2::LinkedMap::<module2::Instance2>::prefix().to_vec(),
|
||||
module2::LinkedMap::<module2::Instance3>::prefix().to_vec(),
|
||||
module2::DoubleMap::<module2::DefaultInstance>::prefix().to_vec(),
|
||||
module2::DoubleMap::<module2::Instance1>::prefix().to_vec(),
|
||||
module2::DoubleMap::<module2::Instance2>::prefix().to_vec(),
|
||||
module2::DoubleMap::<module2::Instance3>::prefix().to_vec(),
|
||||
module2::Map::<module2::DefaultInstance>::key_for(0),
|
||||
module2::Map::<module2::Instance1>::key_for(0).to_vec(),
|
||||
module2::Map::<module2::Instance2>::key_for(0).to_vec(),
|
||||
module2::Map::<module2::Instance3>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<module2::DefaultInstance>::key_for(0),
|
||||
module2::LinkedMap::<module2::Instance1>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<module2::Instance2>::key_for(0).to_vec(),
|
||||
module2::LinkedMap::<module2::Instance3>::key_for(0).to_vec(),
|
||||
module2::Map::<module2::DefaultInstance>::key_for(1),
|
||||
module2::Map::<module2::Instance1>::key_for(1).to_vec(),
|
||||
module2::Map::<module2::Instance2>::key_for(1).to_vec(),
|
||||
module2::Map::<module2::Instance3>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<module2::DefaultInstance>::key_for(1),
|
||||
module2::LinkedMap::<module2::Instance1>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<module2::Instance2>::key_for(1).to_vec(),
|
||||
module2::LinkedMap::<module2::Instance3>::key_for(1).to_vec(),
|
||||
module2::DoubleMap::<module2::DefaultInstance>::prefix_for(1),
|
||||
module2::DoubleMap::<module2::Instance1>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<module2::Instance2>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<module2::Instance3>::prefix_for(1).to_vec(),
|
||||
module2::DoubleMap::<module2::DefaultInstance>::key_for(1, 1),
|
||||
module2::DoubleMap::<module2::Instance1>::key_for(1, 1).to_vec(),
|
||||
module2::DoubleMap::<module2::Instance2>::key_for(1, 1).to_vec(),
|
||||
module2::DoubleMap::<module2::Instance3>::key_for(1, 1).to_vec(),
|
||||
].iter() {
|
||||
assert!(map.insert(key, ()).is_none())
|
||||
}
|
||||
@@ -378,9 +322,9 @@ fn storage_instance_independance() {
|
||||
fn storage_with_instance_basic_operation() {
|
||||
with_externalities(&mut new_test_ext(), || {
|
||||
type Value = module2::Value<Runtime, module2::Instance1>;
|
||||
type Map = module2::Map<Runtime, module2::Instance1>;
|
||||
type LinkedMap = module2::LinkedMap<Runtime, module2::Instance1>;
|
||||
type DoubleMap = module2::DoubleMap<Runtime, module2::Instance1>;
|
||||
type Map = module2::Map<module2::Instance1>;
|
||||
type LinkedMap = module2::LinkedMap<module2::Instance1>;
|
||||
type DoubleMap = module2::DoubleMap<module2::Instance1>;
|
||||
|
||||
assert_eq!(Value::exists(), true);
|
||||
assert_eq!(Value::get(), 4);
|
||||
@@ -432,4 +376,4 @@ fn storage_with_instance_basic_operation() {
|
||||
DoubleMap::remove(key1, key2);
|
||||
assert_eq!(DoubleMap::get(key1, key2), 0);
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user