chore: rename outer event in mocks

Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
interlay · Nov 11, 2022 · 484df9b · 484df9b
1 parent 767a708
commit 484df9b
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 85 deletions.
diff --git a/crates/annuity/src/mock.rs b/crates/annuity/src/mock.rs
@@ -50,7 +50,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -115,7 +115,7 @@ parameter_types! {
 
 impl Config for Test {
     type AnnuityPalletId = AnnuityPalletId;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type Currency = Balances;
     type BlockRewardProvider = MockBlockRewardProvider;
     type BlockNumberToBalance = Identity;
@@ -124,11 +124,7 @@ impl Config for Test {
     type WeightInfo = ();
 }
 
-pub type TestEvent = Event;
-// pub type TestError = Error<Test>;
-
-// pub const ALICE: AccountId = 1;
-// pub const BOB: AccountId = 2;
+pub type TestEvent = RuntimeEvent;
 
 pub struct ExtBuilder;
 

diff --git a/crates/btc-relay/src/mock.rs b/crates/btc-relay/src/mock.rs
@@ -57,7 +57,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -75,7 +75,7 @@ parameter_types! {
 }
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type ParachainBlocksPerBitcoinBlock = ParachainBlocksPerBitcoinBlock;
     type WeightInfo = ();
 }
@@ -92,10 +92,10 @@ impl pallet_timestamp::Config for Test {
 }
 
 impl security::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 pub type TestError = Error<Test>;
 
 pub struct ExtBuilder;

diff --git a/crates/clients-info/src/mock.rs b/crates/clients-info/src/mock.rs
@@ -46,7 +46,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -59,10 +59,10 @@ impl frame_system::Config for Test {
     type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type WeightInfo = ();
 }
 

diff --git a/crates/currency/src/mock.rs b/crates/currency/src/mock.rs
@@ -59,7 +59,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -129,7 +129,7 @@ parameter_types! {
     pub const MinimumPeriod: Moment = 5;
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 
 pub struct ExtBuilder;
 

diff --git a/crates/escrow/src/mock.rs b/crates/escrow/src/mock.rs
@@ -49,7 +49,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -84,7 +84,7 @@ parameter_types! {
 }
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockNumberToBalance = Identity;
     type Currency = Balances;
     type Span = Span;
@@ -93,7 +93,7 @@ impl Config for Test {
     type WeightInfo = ();
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 pub type TestError = Error<Test>;
 
 pub const ALICE: AccountId = 1;

diff --git a/crates/fee/src/mock.rs b/crates/fee/src/mock.rs
@@ -72,7 +72,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -118,7 +118,7 @@ impl orml_tokens::Config for Test {
 }
 
 impl reward::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type RewardId = VaultId<AccountId, CurrencyId>;
     type CurrencyId = CurrencyId;
@@ -127,7 +127,7 @@ impl reward::Config for Test {
 }
 
 impl staking::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type SignedInner = SignedInner;
     type CurrencyId = CurrencyId;
@@ -146,7 +146,7 @@ impl pallet_timestamp::Config for Test {
 }
 
 impl security::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
 }
 
 pub struct CurrencyConvert;
@@ -188,7 +188,7 @@ impl Config for Test {
     type MaxExpectedValue = MaxExpectedValue;
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 
 #[allow(dead_code)]
 pub type TestError = Error<Test>;

diff --git a/crates/issue/src/mock.rs b/crates/issue/src/mock.rs
@@ -78,7 +78,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -128,7 +128,7 @@ impl orml_tokens::Config for Test {
 }
 
 impl reward::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type RewardId = VaultId<AccountId, CurrencyId>;
     type CurrencyId = CurrencyId;
@@ -150,7 +150,7 @@ where
 
 impl vault_registry::Config for Test {
     type PalletId = VaultPalletId;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
     type WeightInfo = ();
     type GetGriefingCollateralCurrencyId = GetNativeCurrencyId;
@@ -184,7 +184,7 @@ impl currency::Config for Test {
 }
 
 impl staking::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type SignedInner = SignedInner;
     type CurrencyId = CurrencyId;
@@ -196,13 +196,13 @@ parameter_types! {
 }
 
 impl btc_relay::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type ParachainBlocksPerBitcoinBlock = ParachainBlocksPerBitcoinBlock;
     type WeightInfo = ();
 }
 
 impl security::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
 }
 
 parameter_types! {
@@ -217,7 +217,7 @@ impl pallet_timestamp::Config for Test {
 }
 
 impl oracle::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type WeightInfo = ();
 }
 
@@ -248,12 +248,12 @@ impl Convert<BlockNumber, Balance> for BlockNumberToBalance {
 }
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockNumberToBalance = BlockNumberToBalance;
     type WeightInfo = ();
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 pub type TestError = Error<Test>;
 pub type VaultRegistryError = vault_registry::Error<Test>;
 

diff --git a/crates/nomination/src/mock.rs b/crates/nomination/src/mock.rs
@@ -78,7 +78,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -133,7 +133,7 @@ impl orml_tokens::Config for Test {
 }
 
 impl reward::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type RewardId = VaultId<AccountId, CurrencyId>;
     type CurrencyId = CurrencyId;
@@ -155,7 +155,7 @@ where
 
 impl vault_registry::Config for Test {
     type PalletId = VaultPalletId;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type Balance = Balance;
     type WeightInfo = ();
     type GetGriefingCollateralCurrencyId = GetNativeCurrencyId;
@@ -189,15 +189,15 @@ impl currency::Config for Test {
 }
 
 impl staking::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type SignedInner = SignedInner;
     type CurrencyId = CurrencyId;
     type GetNativeCurrencyId = GetNativeCurrencyId;
 }
 
 impl security::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
 }
 
 parameter_types! {
@@ -230,16 +230,16 @@ impl fee::Config for Test {
 }
 
 impl oracle::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type WeightInfo = ();
 }
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type WeightInfo = ();
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 pub type TestError = Error<Test>;
 
 pub const ALICE: VaultId<AccountId, CurrencyId> = VaultId {

diff --git a/crates/oracle/src/mock.rs b/crates/oracle/src/mock.rs
@@ -66,7 +66,7 @@ impl frame_system::Config for Test {
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
     type PalletInfo = PalletInfo;
@@ -137,7 +137,7 @@ impl currency::Config for Test {
 }
 
 impl Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type WeightInfo = ();
 }
 
@@ -153,18 +153,18 @@ impl pallet_timestamp::Config for Test {
 }
 
 impl security::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
 }
 
 impl staking::Config for Test {
-    type Event = TestEvent;
+    type RuntimeEvent = RuntimeEvent;
     type SignedFixedPoint = SignedFixedPoint;
     type SignedInner = SignedInner;
     type CurrencyId = CurrencyId;
     type GetNativeCurrencyId = GetNativeCurrencyId;
 }
 
-pub type TestEvent = Event;
+pub type TestEvent = RuntimeEvent;
 pub type TestError = Error<Test>;
 
 pub struct ExtBuilder;