@@ -17,17 +17,17 @@ use sp_runtime::traits::{
1717} ;
1818use sp_api:: impl_runtime_apis;
1919use sp_consensus_aura:: sr25519:: AuthorityId as AuraId ;
20- use grandpa :: { AuthorityId as GrandpaId , AuthorityList as GrandpaAuthorityList } ;
21- use grandpa :: fg_primitives;
20+ use pallet_grandpa :: { AuthorityId as GrandpaId , AuthorityList as GrandpaAuthorityList } ;
21+ use pallet_grandpa :: fg_primitives;
2222use sp_version:: RuntimeVersion ;
2323#[ cfg( feature = "std" ) ]
2424use sp_version:: NativeVersion ;
2525
2626// A few exports that help ease life for downstream crates.
2727#[ cfg( any( feature = "std" , test) ) ]
2828pub use sp_runtime:: BuildStorage ;
29- pub use timestamp :: Call as TimestampCall ;
30- pub use balances :: Call as BalancesCall ;
29+ pub use pallet_timestamp :: Call as TimestampCall ;
30+ pub use pallet_balances :: Call as BalancesCall ;
3131pub use sp_runtime:: { Permill , Perbill } ;
3232pub use frame_support:: {
3333 construct_runtime, parameter_types, StorageValue ,
@@ -187,16 +187,16 @@ impl frame_system::Trait for Runtime {
187187 /// What to do if an account is fully reaped from the system.
188188type OnKilledAccount = ( ) ;
189189 /// The data to be stored in an account.
190- type AccountData = balances :: AccountData < Balance > ;
190+ type AccountData = pallet_balances :: AccountData < Balance > ;
191191 /// Weight information for the extrinsics of this pallet.
192192type SystemWeightInfo = ( ) ;
193193}
194194
195- impl aura :: Trait for Runtime {
195+ impl pallet_aura :: Trait for Runtime {
196196 type AuthorityId = AuraId ;
197197}
198198
199- impl grandpa :: Trait for Runtime {
199+ impl pallet_grandpa :: Trait for Runtime {
200200 type Event = Event ;
201201 type Call = Call ;
202202
@@ -217,7 +217,7 @@ parameter_types! {
217217 pub const MinimumPeriod : u64 = SLOT_DURATION / 2 ;
218218}
219219
220- impl timestamp :: Trait for Runtime {
220+ impl pallet_timestamp :: Trait for Runtime {
221221 /// A timestamp: milliseconds since the unix epoch.
222222type Moment = u64 ;
223223 type OnTimestampSet = Aura ;
@@ -229,7 +229,7 @@ parameter_types! {
229229 pub const ExistentialDeposit : u128 = 500 ;
230230}
231231
232- impl balances :: Trait for Runtime {
232+ impl pallet_balances :: Trait for Runtime {
233233 /// The type for recording an account's balance.
234234type Balance = Balance ;
235235 /// The ubiquitous event type.
@@ -244,15 +244,15 @@ parameter_types! {
244244 pub const TransactionByteFee : Balance = 1 ;
245245}
246246
247- impl transaction_payment :: Trait for Runtime {
248- type Currency = balances :: Module < Runtime > ;
247+ impl pallet_transaction_payment :: Trait for Runtime {
248+ type Currency = Balances ;
249249 type OnTransactionPayment = ( ) ;
250250 type TransactionByteFee = TransactionByteFee ;
251251 type WeightToFee = IdentityFee < Balance > ;
252252 type FeeMultiplierUpdate = ( ) ;
253253}
254254
255- impl sudo :: Trait for Runtime {
255+ impl pallet_sudo :: Trait for Runtime {
256256 type Event = Event ;
257257 type Call = Call ;
258258}
@@ -270,13 +270,13 @@ construct_runtime!(
270270 UncheckedExtrinsic = UncheckedExtrinsic
271271 {
272272 System : frame_system:: { Module , Call , Config , Storage , Event <T >} ,
273- RandomnessCollectiveFlip : randomness_collective_flip :: { Module , Call , Storage } ,
274- Timestamp : timestamp :: { Module , Call , Storage , Inherent } ,
275- Aura : aura :: { Module , Config <T >, Inherent } ,
276- Grandpa : grandpa :: { Module , Call , Storage , Config , Event } ,
277- Balances : balances :: { Module , Call , Storage , Config <T >, Event <T >} ,
278- TransactionPayment : transaction_payment :: { Module , Storage } ,
279- Sudo : sudo :: { Module , Call , Config <T >, Storage , Event <T >} ,
273+ RandomnessCollectiveFlip : pallet_randomness_collective_flip :: { Module , Call , Storage } ,
274+ Timestamp : pallet_timestamp :: { Module , Call , Storage , Inherent } ,
275+ Aura : pallet_aura :: { Module , Config <T >, Inherent } ,
276+ Grandpa : pallet_grandpa :: { Module , Call , Storage , Config , Event } ,
277+ Balances : pallet_balances :: { Module , Call , Storage , Config <T >, Event <T >} ,
278+ TransactionPayment : pallet_transaction_payment :: { Module , Storage } ,
279+ Sudo : pallet_sudo :: { Module , Call , Config <T >, Storage , Event <T >} ,
280280 // Include the custom logic from the template pallet in the runtime.
281281 TemplateModule : template:: { Module , Call , Storage , Event <T >} ,
282282 }
@@ -300,7 +300,7 @@ pub type SignedExtra = (
300300 frame_system:: CheckEra < Runtime > ,
301301 frame_system:: CheckNonce < Runtime > ,
302302 frame_system:: CheckWeight < Runtime > ,
303- transaction_payment :: ChargeTransactionPayment < Runtime >
303+ pallet_transaction_payment :: ChargeTransactionPayment < Runtime >
304304) ;
305305/// Unchecked extrinsic type as expected by this runtime.
306306pub type UncheckedExtrinsic = generic:: UncheckedExtrinsic < Address , Call , Signature , SignedExtra > ;
@@ -423,7 +423,7 @@ impl_runtime_apis! {
423423 None
424424 }
425425 }
426-
426+
427427 impl frame_system_rpc_runtime_api:: AccountNonceApi <Block , AccountId , Index > for Runtime {
428428 fn account_nonce( account: AccountId ) -> Index {
429429 System :: account_nonce( account)
0 commit comments