Macros to use path instead of ident (#1474)

substrate/frame/support/test/compile_pass/Cargo.toml

@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 renamed-frame-support = { package = "frame-support", path = "../..", default-features = false}
-frame-system = { path = "../../../system", default-features = false}
+renamed-frame-system = { package = "frame-system", path = "../../../system", default-features = false}
 sp-core = { path = "../../../../primitives/core", default-features = false}
 sp-runtime = { path = "../../../../primitives/runtime", default-features = false}
 sp-version = { path = "../../../../primitives/version", default-features = false}
@@ -24,8 +24,8 @@ sp-version = { path = "../../../../primitives/version", default-features = false
 default = [ "std" ]
 std = [
 	"codec/std",
-	"frame-system/std",
 	"renamed-frame-support/std",
+	"renamed-frame-system/std",
 	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",

substrate/frame/support/test/compile_pass/src/lib.rs

@@ -16,7 +16,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! Test that `construct_runtime!` also works when `frame-support` is renamed in the `Cargo.toml`.
+//! Test that `construct_runtime!` also works when `frame-support` or `frame-system` are renamed in
+//! the `Cargo.toml`.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
@@ -50,7 +51,7 @@ parameter_types! {
 	pub const Version: RuntimeVersion = VERSION;
 }
 
-impl frame_system::Config for Runtime {
+impl renamed_frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
@@ -82,6 +83,6 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 
 construct_runtime!(
 	pub struct Runtime {
-		System: frame_system,
+		System: renamed_frame_system,
 	}
 );

substrate/frame/support/test/stg_frame_crate/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "frame-support-test-stg-frame-crate"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+publish = false
+homepage = "https://substrate.io"
+repository.workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+frame = { path = "frame", default-features = false}
+scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
+
+[features]
+default = [ "std" ]
+std = [ "codec/std", "frame/std", "scale-info/std" ]

substrate/frame/support/test/stg_frame_crate/frame/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "frame"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license = "Apache-2.0"
+publish = false
+homepage = "https://substrate.io"
+repository.workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+frame-system = { path = "../../../../system", default-features = false}
+frame-support = { path = "../../..", default-features = false}
+
+[features]
+default = [ "std" ]
+std = [ "frame-support/std", "frame-system/std" ]

substrate/frame/support/test/stg_frame_crate/frame/src/lib.rs

@@ -0,0 +1,21 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub mod deps {
+	pub use frame_support;
+	pub use frame_system;
+}

substrate/frame/support/test/stg_frame_crate/src/lib.rs

@@ -0,0 +1,75 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// ! A basic pallet to test it compiles along with a runtime using it when `frame_system` and
+// `frame_support` are reexported by a `frame` crate.
+
+use frame::deps::{frame_support, frame_system};
+
+#[frame_support::pallet]
+pub mod pallet {
+	use super::*;
+	use frame_support::pallet_prelude::*;
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::config]
+	// The only valid syntax here is the following or
+	// ```
+	// pub trait Config: frame::deps::frame_system::Config {}
+	// ```
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::genesis_config]
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		_config: core::marker::PhantomData<T>,
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
+		fn build(&self) {}
+	}
+}
+
+#[cfg(test)]
+// Dummy test to make sure a runtime would compile.
+mod tests {
+	use super::{
+		frame_support::{construct_runtime, derive_impl},
+		frame_system, pallet,
+	};
+
+	type Block = frame_system::mocking::MockBlock<Runtime>;
+
+	impl crate::pallet::Config for Runtime {}
+
+	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+	impl frame_system::Config for Runtime {
+		type Block = Block;
+	}
+
+	construct_runtime! {
+		pub struct Runtime
+		{
+			System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+			Pallet: pallet::{Pallet, Config<T>},
+		}
+	}
+}

substrate/frame/support/test/tests/pallet_ui/event_type_invalid_bound.rs

@@ -41,5 +41,4 @@ mod pallet {
 	}
 }
 
-fn main() {
-}
+fn main() {}

substrate/frame/support/test/tests/pallet_ui/pass/event_type_bound_system_config_assoc_type.rs

@@ -0,0 +1,44 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#[frame_support::pallet]
+mod pallet {
+	use frame_support::pallet_prelude::{Hooks, IsType};
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config<Hash = sp_core::H256> {
+		type Bar: Clone + std::fmt::Debug + Eq;
+		type RuntimeEvent: IsType<<Self as frame_system::Config>::RuntimeEvent> + From<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(core::marker::PhantomData<T>);
+
+	#[pallet::hooks]
+	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {}
+
+	#[pallet::event]
+	pub enum Event<T: Config> {
+		B { b: T::Bar },
+	}
+}
+
+fn main() {}