Replace 'Module' with 'Pallet' in construct_runtime macro (#8372)

* Use 'Pallet' struct in construct_runtime.

* Fix genesis and metadata macro.

* Fix 'Pallet' type alias.

* Replace 'Module' with 'Pallet' for all construct_runtime use cases.

* Replace more deprecated 'Module' struct.

* Bring back AllModules and AllPalletsWithSystem type, but deprecate them.

* Replace deprecated 'Module' struct from merge master.

* Minor fix.

* Fix UI tests.

* Revert UI override in derive_no_bound.

* Fix more deprecated 'Module' use from master branch.

* Fix more deprecated 'Module' use from master branch.
This commit is contained in:
Shaun Wang
2021-03-18 21:50:08 +13:00
committed by GitHub
parent 05f24931a9
commit 2e5522444a
157 changed files with 881 additions and 864 deletions
+4 -4
View File
@@ -16,7 +16,7 @@
// limitations under the License.
use crate::{
CodeHash, Event, Config, Module as Contracts,
CodeHash, Event, Config, Pallet as Contracts,
TrieId, BalanceOf, ContractInfo, gas::GasMeter, rent::Rent, storage::{self, Storage},
Error, ContractInfoOf, Schedule, AliveContractInfo,
};
@@ -384,7 +384,7 @@ where
depth: 0,
schedule,
timestamp: T::Time::now(),
block_number: <frame_system::Module<T>>::block_number(),
block_number: <frame_system::Pallet<T>>::block_number(),
_phantom: Default::default(),
}
}
@@ -909,7 +909,7 @@ fn deposit_event<T: Config>(
topics: Vec<T::Hash>,
event: Event<T>,
) {
<frame_system::Module<T>>::deposit_event_indexed(
<frame_system::Pallet<T>>::deposit_event_indexed(
&*topics,
<T as Config>::Event::from(event).into(),
)
@@ -961,7 +961,7 @@ mod tests {
}
fn events() -> Vec<Event<Test>> {
<frame_system::Module<Test>>::events()
<frame_system::Pallet<Test>>::events()
.into_iter()
.filter_map(|meta| match meta.event {
MetaEvent::pallet_contracts(contract_event) => Some(contract_event),