Make decl_event! more ergonomic

srml/balances/src/lib.rs

@@ -136,8 +136,11 @@ decl_module! {
 }
 
 decl_event!(
-	pub enum Event<T> with RawEvent<AccountId, AccountIndex, Balance>
-		where <T as system::Trait>::AccountId, <T as Trait>::AccountIndex, <T as Trait>::Balance {
+	pub enum Event<T> where
+		<T as system::Trait>::AccountId,
+		<T as Trait>::AccountIndex,
+		<T as Trait>::Balance
+	{
 		/// A new account was created.
 		NewAccount(AccountId, AccountIndex, NewAccountOutcome),
 		/// An account was reaped.

srml/council/src/motions.rs

@@ -49,9 +49,7 @@ pub enum Origin {
 
 /// Event for this module.
 decl_event!(
-	pub enum Event<T> with RawEvent<Hash, AccountId>
-		where <T as system::Trait>::Hash, <T as system::Trait>::AccountId
-	{
+	pub enum Event<T> where <T as system::Trait>::Hash, <T as system::Trait>::AccountId {
 		/// A motion (given hash) has been proposed (by given account) with a threshold (given u32).
 		Proposed(AccountId, ProposalIndex, Hash, u32),
 		/// A motion (given hash) has been voted on by given account, leaving

srml/council/src/seats.rs

@@ -156,9 +156,7 @@ decl_storage! {
 
 decl_event!(
 	/// An event in this module.
-	pub enum Event<T> with RawEvent<AccountId>
-		where <T as system::Trait>::AccountId
-	{
+	pub enum Event<T> where <T as system::Trait>::AccountId {
 		/// reaped voter, reaper
 		VoterReaped(AccountId, AccountId),
 		/// slashed reaper

srml/council/src/voting.rs

@@ -55,9 +55,7 @@ decl_storage! {
 
 /// An event in this module.
 decl_event!(
-	pub enum Event<T> with RawEvent<Hash>
-		where <T as system::Trait>::Hash
-	{
+	pub enum Event<T> where <T as system::Trait>::Hash {
 		/// A voting tally has happened for a referendum cancelation vote.
 		/// Last three are yes, no, abstain counts.
 		TallyCancelation(Hash, u32, u32, u32),

srml/democracy/src/lib.rs

@@ -110,9 +110,7 @@ decl_storage! {
 
 decl_event!(
 	/// An event in this module.
-	pub enum Event<T> with RawEvent<Balance, AccountId>
-		where <T as balances::Trait>::Balance, <T as system::Trait>::AccountId
-	{
+	pub enum Event<T> where <T as balances::Trait>::Balance, <T as system::Trait>::AccountId {
 		Tabled(PropIndex, Balance, Vec<AccountId>),
 		Started(ReferendumIndex, VoteThreshold),
 		Passed(ReferendumIndex),

srml/example/src/lib.rs

@@ -121,9 +121,7 @@ decl_module! {
 /// circumstances that have happened that users, Dapps and/or chain explorers would find
 /// interesting and otherwise difficult to detect.
 decl_event!(
-	pub enum Event<T> with RawEvent<B>
-		where <T as balances::Trait>::Balance
-	{
+	pub enum Event<T> where B = <T as balances::Trait>::Balance {
 		// Just a normal `enum`, here's a dummy event to ensure it compiles.
 		/// Dummy event, just here so there's a generic type that's used.
 		Dummy(B),

srml/session/src/lib.rs

@@ -84,9 +84,7 @@ decl_module! {
 
 /// An event in this module.
 decl_event!(
-	pub enum Event<T> with RawEvent<BlockNumber>
-		where <T as system::Trait>::BlockNumber
-	{
+	pub enum Event<T> where <T as system::Trait>::BlockNumber {
 		/// New session has happened. Note that the argument is the session index, not the block
 		/// number as the type might suggest.
 		NewSession(BlockNumber),

srml/staking/src/lib.rs

@@ -120,9 +120,7 @@ decl_module! {
 
 /// An event in this module.
 decl_event!(
-	pub enum Event<T> with RawEvent<Balance, AccountId>
-		where <T as balances::Trait>::Balance, <T as system::Trait>::AccountId
-	{
+	pub enum Event<T> where <T as balances::Trait>::Balance, <T as system::Trait>::AccountId {
 		/// All validators have been rewarded by the given balance.
 		Reward(Balance),
 		/// One validator (and their nominators) has been given a offline-warning (they're still