Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for substrate#10620 #4696

Merged
merged 2 commits into from
Jan 12, 2022
Merged

Companion for substrate#10620 #4696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9287cf
fix tests
xlc Jan 12, 2022
64ddc5f
update lockfile for substrate
Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/parachains/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,11 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
let block_number = <T as frame_system::Config>::BlockNumber::from(block);
let header = Self::header(block_number.clone());

frame_system::Pallet::<T>::reset_events();
frame_system::Pallet::<T>::initialize(
&header.number(),
&header.hash(),
&Digest { logs: Vec::new() },
Default::default(),
);

assert_eq!(<shared::Pallet<T>>::session_index(), target_session);
Expand Down
4 changes: 2 additions & 2 deletions runtime/parachains/src/disputes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,6 @@ mod tests {
assert_err, assert_noop, assert_ok, assert_storage_noop,
traits::{OnFinalize, OnInitialize},
};
use frame_system::InitKind;
use primitives::v1::BlockNumber;
use sp_core::{crypto::CryptoType, Pair};

Expand Down Expand Up @@ -1265,7 +1264,8 @@ mod tests {
System::finalize();
}

System::initialize(&(b + 1), &Default::default(), &Default::default(), InitKind::Full);
System::reset_events();
System::initialize(&(b + 1), &Default::default(), &Default::default());
AllPalletsWithSystem::on_initialize(b + 1);

if let Some(new_session) = new_session(b + 1) {
Expand Down