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
2026-04-27 03:27:58 +00:00 · 2019-06-27 13:40:22 +02:00
parent 23ea5d1795
commit 62b7c05def
55 changed files with 1441 additions and 860 deletions
@@ -0,0 +1,52 @@
+use srml_support::codec::{Encode, Decode};
+
+pub trait Trait: 'static + Eq + Clone {
+	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
+		+ From<RawOrigin<Self::AccountId>>;
+
+	type BlockNumber: Decode + Encode + Clone + Default;
+	type Hash;
+	type AccountId: Encode + Decode;
+	type Event: From<Event>;
+}
+
+srml_support::decl_module! {
+	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
+		pub fn deposit_event(_event: T::Event) {
+		}
+	}
+}
+
+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>;
+
+#[allow(dead_code)]
+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")
+}