pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 08:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent name clash with Substrate Pallet Template (#2536)

Browse Source 
* Remove cumulus template pallet

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Use substrate template pallet

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update Cargo.lock

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Revert back to master

Revert "Remove cumulus template pallet"

This reverts commit a6d3566e52e9124c0e9823c12cacea557187c6b4.

Revert "Use substrate template pallet"

This reverts commit fbb8eea28dec5b75e13823762572d24bd9a4b88f.

Revert "Update Cargo.lock"

This reverts commit ee24cb81e5d91d6b8f7ef0c97d0f0fdbfe857c53.

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* pallet-template -> pallet-parachain-template

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update Cargo.lock

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
2023-05-08 17:20:20 +02:00
committed by GitHub
parent 943e2c8622
commit 27d80ba4a9
6 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/parachain-template/pallets/template/Cargo.toml
+1 -1
View File
@@ -1,5 +1,5 @@
[package]
name = "pallet-template"
name = "pallet-parachain-template"
authors = ["Anonymous"]
description = "FRAME pallet template for defining custom runtime logic."
version = "0.1.0"
cumulus/parachain-template/pallets/template/src/benchmarking.rs
+1 -1
View File
@@ -1,4 +1,4 @@
//! Benchmarking setup for pallet-template
//! Benchmarking setup for pallet-parachain-template
use super::*;
cumulus/parachain-template/pallets/template/src/mock.rs
+2 -3
View File
@@ -1,4 +1,3 @@
use crate as pallet_template;
use frame_support::{parameter_types, traits::Everything};
use frame_system as system;
use sp_core::H256;
@@ -18,7 +17,7 @@ frame_support::construct_runtime!(
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
TemplateModule: pallet_template::{Pallet, Call, Storage, Event<T>},
TemplateModule: crate::{Pallet, Call, Storage, Event<T>},
}
);
@@ -54,7 +53,7 @@ impl system::Config for Test {
type MaxConsumers = frame_support::traits::ConstU32<16>;
}
impl pallet_template::Config for Test {
impl crate::Config for Test {
type RuntimeEvent = RuntimeEvent;
}
cumulus/parachain-template/runtime/Cargo.toml
+4 -4
View File
@@ -22,7 +22,7 @@ scale-info = { version = "2.6.0", default-features = false, features = ["derive"
smallvec = "1.10.0"
# Local
pallet-template = { path = "../pallets/template", default-features = false }
pallet-parachain-template = { path = "../pallets/template", default-features = false }
# Substrate
frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "master" }
@@ -99,7 +99,7 @@ std = [
"pallet-collator-selection/std",
"pallet-session/std",
"pallet-sudo/std",
"pallet-template/std",
"pallet-parachain-template/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
"pallet-transaction-payment/std",
@@ -132,7 +132,7 @@ runtime-benchmarks = [
"frame-system/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-selection/runtime-benchmarks",
"pallet-template/runtime-benchmarks",
"pallet-parachain-template/runtime-benchmarks",
"pallet-timestamp/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
@@ -156,7 +156,7 @@ try-runtime = [
"pallet-collator-selection/try-runtime",
"pallet-session/try-runtime",
"pallet-sudo/try-runtime",
"pallet-template/try-runtime",
"pallet-parachain-template/try-runtime",
"pallet-timestamp/try-runtime",
"pallet-transaction-payment/try-runtime",
"pallet-xcm/try-runtime",
cumulus/parachain-template/runtime/src/lib.rs
+3 -3
View File
@@ -58,7 +58,7 @@ use xcm::latest::prelude::BodyId;
use xcm_executor::XcmExecutor;
/// Import the template pallet.
pub use pallet_template;
pub use pallet_parachain_template;
/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
pub type Signature = MultiSignature;
@@ -457,7 +457,7 @@ impl pallet_collator_selection::Config for Runtime {
}
/// Configure the pallet template in pallets/template.
impl pallet_template::Config for Runtime {
impl pallet_parachain_template::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
}
@@ -492,7 +492,7 @@ construct_runtime!(
DmpQueue: cumulus_pallet_dmp_queue = 33,
// Template
TemplatePallet: pallet_template = 40,
TemplatePallet: pallet_parachain_template = 40,
}
);