Companion for paritytech/substrate#12451 & fix tests

darwinia-network · Jan 28, 2023 · 2808531 · 2808531
1 parent 3abfbce
commit 2808531
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/dispatch/Cargo.toml b/modules/dispatch/Cargo.toml
@@ -14,11 +14,12 @@ scale-info = { version = "2.1", default-features = false, features = ["derive"]
 bp-message-dispatch = { default-features = false, path = "../../primitives/message-dispatch" }
 bp-runtime          = { default-features = false, path = "../../primitives/runtime" }
 # paritytech
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
-frame-system  = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
-sp-core       = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
-sp-runtime    = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
-sp-std        = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+frame-support       = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+frame-system        = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+pallet-root-testing = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-core             = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-runtime          = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-std              = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
 
 [dev-dependencies]
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
@@ -35,6 +36,7 @@ std = [
 	# paritytech
 	"frame-support/std",
 	"frame-system/std",
+	"pallet-root-testing/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",

diff --git a/modules/dispatch/src/lib.rs b/modules/dispatch/src/lib.rs
@@ -542,6 +542,7 @@ mod tests {
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
+			RootTesting: pallet_root_testing,
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Dispatch: call_dispatch::{Pallet, Call, Event<T>},
 		}
@@ -554,6 +555,8 @@ mod tests {
 		pub const AvailableBlockRatio: Perbill = Perbill::one();
 	}
 
+	impl pallet_root_testing::Config for TestRuntime {}
+
 	impl frame_system::Config for TestRuntime {
 		type AccountData = ();
 		type AccountId = AccountId;
@@ -581,6 +584,7 @@ mod tests {
 		type Version = ();
 	}
 
+
 	impl Config for TestRuntime {
 		type AccountIdConverter = AccountIdConverter;
 		type BridgeMessageId = BridgeMessageId;
@@ -618,7 +622,7 @@ mod tests {
 			call: &RuntimeCall,
 		) -> Result<(), TransactionValidityError> {
 			match call {
-				RuntimeCall::System(frame_system::Call::fill_block { .. }) =>
+				RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block { .. }) =>
 					Err(TransactionValidityError::Invalid(InvalidTransaction::Call)),
 				_ => Ok(()),
 			}
@@ -887,7 +891,7 @@ mod tests {
 			let id = [0; 4];
 			let relayer_account = 1;
 
-			let call = RuntimeCall::System(frame_system::Call::fill_block {
+			let call = RuntimeCall::RootTesting(pallet_root_testing::Call::fill_block {
 				ratio: Perbill::from_percent(75),
 			});
 			let weight = call.get_dispatch_info().weight;

diff --git a/modules/grandpa/src/mock.rs b/modules/grandpa/src/mock.rs
@@ -26,7 +26,7 @@ use frame_support::{
 	weights::Weight,
 };
 use frame_system::mocking::*;
-use sp_core::sr25519::Signature;
+use sp_core::{sr25519::Signature, ConstU64};
 use sp_runtime::{
 	testing::{Header, H256},
 	traits::{BlakeTwo256, IdentityLookup},

diff --git a/modules/parachains/src/mock.rs b/modules/parachains/src/mock.rs
@@ -20,6 +20,7 @@ use bp_runtime::Chain;
 // paritytech
 use frame_support::{traits::IsInVec, weights::Weight};
 use frame_system::mocking::*;
+use sp_core::ConstU32;
 use sp_runtime::{
 	testing::{Header, H256},
 	traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},