pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 06:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-alias frame_system in node template runtime (#6829)

Browse Source 
* de-alias frame_system in node template

* Fix line length

* Fix chainspec
This commit is contained in:
Joshy Orndorff
2020-08-06 12:18:35 -04:00
committed by GitHub
parent dbc66479f3
commit 07c56a9be9
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/node-template/runtime/Cargo.toml
+2 -2
View File
@@ -18,7 +18,7 @@ frame-support = { version = "2.0.0-rc5", default-features = false, path = "../..
grandpa = { version = "2.0.0-rc5", default-features = false, package = "pallet-grandpa", path = "../../../frame/grandpa" }
randomness-collective-flip = { version = "2.0.0-rc5", default-features = false, package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip" }
sudo = { version = "2.0.0-rc5", default-features = false, package = "pallet-sudo", path = "../../../frame/sudo" }
system = { version = "2.0.0-rc5", default-features = false, package = "frame-system", path = "../../../frame/system" }
frame-system = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/system" }
timestamp = { version = "2.0.0-rc5", default-features = false, package = "pallet-timestamp", path = "../../../frame/timestamp" }
transaction-payment = { version = "2.0.0-rc5", default-features = false, package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" }
frame-executive = { version = "2.0.0-rc5", default-features = false, path = "../../../frame/executive" }
@@ -67,7 +67,7 @@ std = [
"sp-transaction-pool/std",
"sp-version/std",
"sudo/std",
"system/std",
"frame-system/std",
"timestamp/std",
"transaction-payment/std",
"frame-system-rpc-runtime-api/std",
substrate/bin/node-template/runtime/src/lib.rs
+15 -9
View File
@@ -133,7 +133,7 @@ parameter_types! {
// Configure FRAME pallets to include in runtime.
impl system::Trait for Runtime {
impl frame_system::Trait for Runtime {
/// The basic call filter to use in dispatchable.
type BaseCallFilter = ();
/// The identifier used to distinguish between accounts.
@@ -269,7 +269,7 @@ construct_runtime!(
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic
{
System: system::{Module, Call, Config, Storage, Event<T>},
System: frame_system::{Module, Call, Config, Storage, Event<T>},
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Call, Storage},
Timestamp: timestamp::{Module, Call, Storage, Inherent},
Aura: aura::{Module, Config<T>, Inherent},
@@ -294,12 +294,12 @@ pub type SignedBlock = generic::SignedBlock<Block>;
pub type BlockId = generic::BlockId<Block>;
/// The SignedExtension to the basic transaction logic.
pub type SignedExtra = (
system::CheckSpecVersion<Runtime>,
system::CheckTxVersion<Runtime>,
system::CheckGenesis<Runtime>,
system::CheckEra<Runtime>,
system::CheckNonce<Runtime>,
system::CheckWeight<Runtime>,
frame_system::CheckSpecVersion<Runtime>,
frame_system::CheckTxVersion<Runtime>,
frame_system::CheckGenesis<Runtime>,
frame_system::CheckEra<Runtime>,
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
transaction_payment::ChargeTransactionPayment<Runtime>
);
/// Unchecked extrinsic type as expected by this runtime.
@@ -307,7 +307,13 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signatu
/// Extrinsic type that has already been checked.
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Call, SignedExtra>;
/// Executive: handles dispatch to the various modules.
pub type Executive = frame_executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Runtime, AllModules>;
pub type Executive = frame_executive::Executive<
Runtime,
Block,
frame_system::ChainContext<Runtime>,
Runtime,
AllModules,
>;
impl_runtime_apis! {
impl sp_api::Core<Block> for Runtime {