diff --git a/crates/annuity/src/mock.rs b/crates/annuity/src/mock.rs index 7db0a9265f..d2fd3ac264 100644 --- 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; 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; - -// 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 index b57d3551cf..84f0b57412 100644 --- 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; 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; pub struct ExtBuilder; diff --git a/crates/clients-info/src/mock.rs b/crates/clients-info/src/mock.rs index 9b6c760302..788906919b 100644 --- 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; 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 index 3c975b00a9..de3826a45c 100644 --- 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; 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 index df80b43e64..c8721c699b 100644 --- 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; 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; pub const ALICE: AccountId = 1; diff --git a/crates/fee/src/mock.rs b/crates/fee/src/mock.rs index 26ab9eaffb..c8ea986614 100644 --- 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; 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; 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; diff --git a/crates/issue/src/mock.rs b/crates/issue/src/mock.rs index 7a15502771..137843407b 100644 --- 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; 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; 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 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; pub type VaultRegistryError = vault_registry::Error; diff --git a/crates/nomination/src/mock.rs b/crates/nomination/src/mock.rs index b2df427390..5f4e3852ba 100644 --- 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; 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; 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,7 +189,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; @@ -197,7 +197,7 @@ impl staking::Config for Test { } 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; pub const ALICE: VaultId = VaultId { diff --git a/crates/oracle/src/mock.rs b/crates/oracle/src/mock.rs index ce5dcedf59..7c948c7a9b 100644 --- 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; 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; pub struct ExtBuilder; diff --git a/crates/redeem/src/mock.rs b/crates/redeem/src/mock.rs index ecd41a1086..01922985d6 100644 --- a/crates/redeem/src/mock.rs +++ b/crates/redeem/src/mock.rs @@ -79,7 +79,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -147,7 +147,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; @@ -181,7 +181,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; @@ -189,7 +189,7 @@ impl staking::Config for Test { } impl reward::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedFixedPoint = SignedFixedPoint; type RewardId = VaultId; type CurrencyId = CurrencyId; @@ -202,13 +202,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! { @@ -223,7 +223,7 @@ impl pallet_timestamp::Config for Test { } impl oracle::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -246,11 +246,11 @@ impl fee::Config for Test { } impl Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; pub type TestError = Error; pub type VaultRegistryError = vault_registry::Error; diff --git a/crates/replace/src/mock.rs b/crates/replace/src/mock.rs index d3be8a3232..026f39559d 100644 --- a/crates/replace/src/mock.rs +++ b/crates/replace/src/mock.rs @@ -79,7 +79,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -129,7 +129,7 @@ impl orml_tokens::Config for Test { } impl reward::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedFixedPoint = SignedFixedPoint; type RewardId = VaultId; type CurrencyId = CurrencyId; @@ -177,14 +177,14 @@ impl currency::Config for Test { impl vault_registry::Config for Test { type PalletId = VaultPalletId; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type WeightInfo = (); type GetGriefingCollateralCurrencyId = GetNativeCurrencyId; } impl staking::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedFixedPoint = SignedFixedPoint; type SignedInner = SignedInner; type CurrencyId = CurrencyId; @@ -196,17 +196,17 @@ 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; } impl nomination::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -222,7 +222,7 @@ impl pallet_timestamp::Config for Test { } impl oracle::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -245,11 +245,11 @@ impl fee::Config for Test { } impl Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; pub type TestError = Error; pub const OLD_VAULT: VaultId = VaultId { diff --git a/crates/reward/src/mock.rs b/crates/reward/src/mock.rs index d51794f888..938fee972d 100644 --- a/crates/reward/src/mock.rs +++ b/crates/reward/src/mock.rs @@ -48,7 +48,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -67,7 +67,7 @@ parameter_types! { } impl Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedFixedPoint = SignedFixedPoint; type RewardId = AccountId; type CurrencyId = CurrencyId; @@ -75,7 +75,7 @@ impl Config for Test { type GetWrappedCurrencyId = GetWrappedCurrencyId; } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; pub type TestError = Error; pub const ALICE: AccountId = 1; diff --git a/crates/security/src/mock.rs b/crates/security/src/mock.rs index 3bb87f0609..c4cdfd2a3c 100644 --- a/crates/security/src/mock.rs +++ b/crates/security/src/mock.rs @@ -46,7 +46,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -60,10 +60,10 @@ impl frame_system::Config for Test { } impl Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; pub type TestError = Error; pub struct ExtBuilder; diff --git a/crates/staking/src/mock.rs b/crates/staking/src/mock.rs index 62f39d41b2..e7ea93a8e2 100644 --- a/crates/staking/src/mock.rs +++ b/crates/staking/src/mock.rs @@ -55,7 +55,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -73,7 +73,7 @@ parameter_types! { } impl Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedInner = SignedInner; type SignedFixedPoint = SignedFixedPoint; type CurrencyId = CurrencyId; @@ -91,7 +91,7 @@ parameter_type_with_key! { }; } impl orml_tokens::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type Amount = RawAmount; type CurrencyId = CurrencyId; @@ -109,7 +109,7 @@ impl orml_tokens::Config for Test { type OnKilledTokenAccount = (); } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; pub type TestError = Error; pub const VAULT: VaultId = VaultId { diff --git a/crates/supply/src/mock.rs b/crates/supply/src/mock.rs index 5522e430fa..4a284846fd 100644 --- a/crates/supply/src/mock.rs +++ b/crates/supply/src/mock.rs @@ -53,7 +53,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -103,14 +103,14 @@ impl OnInflation for MockOnInflation { impl Config for Test { type SupplyPalletId = SupplyPalletId; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type UnsignedFixedPoint = UnsignedFixedPoint; type Currency = Balances; type InflationPeriod = InflationPeriod; type OnInflation = MockOnInflation; } -pub type TestEvent = Event; +pub type TestEvent = RuntimeEvent; // pub type TestError = Error; // pub const ALICE: AccountId = 1; diff --git a/crates/vault-registry/src/mock.rs b/crates/vault-registry/src/mock.rs index dbbc672f31..760208c4f0 100644 --- a/crates/vault-registry/src/mock.rs +++ b/crates/vault-registry/src/mock.rs @@ -75,7 +75,7 @@ impl frame_system::Config for Test { type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -130,7 +130,7 @@ impl orml_tokens::Config for Test { } impl reward::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type SignedFixedPoint = SignedFixedPoint; type RewardId = VaultId; type CurrencyId = CurrencyId; @@ -150,7 +150,7 @@ impl pallet_timestamp::Config for Test { } impl oracle::Config for Test { - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } @@ -207,7 +207,7 @@ parameter_types! { impl Config for Test { type PalletId = VaultPalletId; - type Event = TestEvent; + type RuntimeEvent = RuntimeEvent; type Balance = Balance; type WeightInfo = (); type GetGriefingCollateralCurrencyId = GetNativeCurrencyId; @@ -222,18 +222,18 @@ where } 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; pub type TokensError = orml_tokens::Error;