Fix failing tests

Author: dastansam

Cargo.lock

@@ -36,7 +36,6 @@ pub const CT_UNIT: u128 = 10_u128.pow(CT_DECIMALS as u32);
 pub type IntegrationInstantiator = pallet_funding::instantiator::Instantiator<
 	PolimecRuntime,
 	<PolimecRuntime as pallet_funding::Config>::AllPalletsWithoutSystem,
-	cumulus_pallet_parachain_system::RelaychainDataProvider<PolimecRuntime>,
 	<PolimecRuntime as pallet_funding::Config>::RuntimeEvent,
 >;
 

integration-tests/src/tests/defaults.rs

@@ -51,6 +51,8 @@ hex.workspace = true
 # Used in the instantiator.
 itertools.workspace = true
 sp-io.workspace = true
+cumulus-pallet-parachain-system.workspace = true
+cumulus-primitives-core.workspace = true
 
 [dev-dependencies]
 pallet-timestamp.workspace = true

pallets/funding/Cargo.toml

@@ -48,8 +48,7 @@ use sp_runtime::traits::{Get, Member, TrailingZeroInput, Zero};
 const IPFS_CID: &str = "QmbvsJBhQtu9uAGVp7x4H77JkwAQxV7TA6xTfdeALuDiYB";
 const CT_DECIMALS: u8 = 17;
 const CT_UNIT: u128 = 10u128.pow(CT_DECIMALS as u32);
-type BenchInstantiator<T> =
-	Instantiator<T, <T as Config>::AllPalletsWithoutSystem, System, <T as Config>::RuntimeEvent>;
+type BenchInstantiator<T> = Instantiator<T, <T as Config>::AllPalletsWithoutSystem, <T as Config>::RuntimeEvent>;
 
 pub fn usdt_id() -> Location {
 	AcceptedFundingAsset::USDT.id()

pallets/funding/src/benchmarking.rs

@@ -12,11 +12,10 @@ use sp_runtime::traits::TrailingZeroInput;
 use InvestorType::{self, *};
 
 impl<
-		T: Config,
+		T: Config + cumulus_pallet_parachain_system::Config,
 		AllPalletsWithoutSystem: OnFinalize<BlockNumberFor<T>> + OnIdle<BlockNumberFor<T>> + OnInitialize<BlockNumberFor<T>>,
-		BNProvider: BlockNumberProvider<BlockNumber = frame_system::pallet_prelude::BlockNumberFor<T>>,
 		RuntimeEvent: From<Event<T>> + TryInto<Event<T>> + Parameter + Member + IsType<<T as frame_system::Config>::RuntimeEvent>,
-	> Instantiator<T, AllPalletsWithoutSystem, BNProvider, RuntimeEvent>
+	> Instantiator<T, AllPalletsWithoutSystem, RuntimeEvent>
 {
 	pub fn get_ed(&self) -> Balance {
 		T::ExistentialDeposit::get()

pallets/funding/src/instantiator/calculations.rs

@@ -6,11 +6,10 @@ use polimec_common::assets::AcceptedFundingAsset;
 
 // general chain interactions
 impl<
-		T: Config + pallet_balances::Config<Balance = Balance>,
+		T: Config + pallet_balances::Config<Balance = Balance> + cumulus_pallet_parachain_system::Config,
 		AllPalletsWithoutSystem: OnFinalize<BlockNumberFor<T>> + OnIdle<BlockNumberFor<T>> + OnInitialize<BlockNumberFor<T>>,
-		BNProvider: BlockNumberProvider<BlockNumber = frame_system::pallet_prelude::BlockNumberFor<T>>,
 		RuntimeEvent: From<Event<T>> + TryInto<Event<T>> + Parameter + Member + IsType<<T as frame_system::Config>::RuntimeEvent>,
-	> Instantiator<T, AllPalletsWithoutSystem, BNProvider, RuntimeEvent>
+	> Instantiator<T, AllPalletsWithoutSystem, RuntimeEvent>
 {
 	pub fn new(ext: OptionalExternalities) -> Self {
 		Self { ext, nonce: RefCell::new(0u64), _marker: PhantomData }
@@ -145,13 +144,13 @@ impl<
 	}
 
 	pub fn current_block(&mut self) -> BlockNumberFor<T> {
-		self.execute(|| BNProvider::current_block_number())
+		self.execute(|| <T as Config>::BlockNumberProvider::current_block_number())
 	}
 
 	pub fn advance_time(&mut self, amount: BlockNumberFor<T>) {
 		self.execute(|| {
 			for _block in 0u32..amount.saturated_into() {
-				let mut current_block = BNProvider::current_block_number();
+				let mut current_block = <T as Config>::BlockNumberProvider::current_block_number();
 
 				<AllPalletsWithoutSystem as OnFinalize<BlockNumberFor<T>>>::on_finalize(current_block);
 				<frame_system::Pallet<T> as OnFinalize<BlockNumberFor<T>>>::on_finalize(current_block);
@@ -160,24 +159,26 @@ impl<
 				<frame_system::Pallet<T> as OnIdle<BlockNumberFor<T>>>::on_idle(current_block, Weight::MAX);
 
 				current_block += One::one();
-				println!("Advancing block to {}", current_block);
-				// frame_system::Pallet::<T>::set_block_number(current_block);
-				BNProvider::set_block_number(current_block);
+				frame_system::Pallet::<T>::set_block_number(current_block);
 
-				let current_block = BNProvider::current_block_number();
-				println!("Executing on_initialize for block {}", current_block);
 				<frame_system::Pallet<T> as OnInitialize<BlockNumberFor<T>>>::on_initialize(current_block);
 				<AllPalletsWithoutSystem as OnInitialize<BlockNumberFor<T>>>::on_initialize(current_block);
 			}
-		})
+		});
+
+		let current_block = self.current_block();
+		// in case we are relying on parachain system
+		self.set_relay_chain_block_number(current_block + amount);
 	}
 
 	pub fn jump_to_block(&mut self, block: BlockNumberFor<T>) {
 		let current_block = self.current_block();
-		println!("Jumping from block {} to block {}", current_block, block);
 		if block > current_block {
-			// self.execute(|| frame_system::Pallet::<T>::set_block_number(block - One::one()));
-			self.execute(|| BNProvider::set_block_number(block - One::one()));
+			self.execute(|| {
+				frame_system::Pallet::<T>::set_block_number(block - One::one());
+			});
+			self.set_relay_chain_block_number(block - One::one());
+
 			self.advance_time(One::one());
 		} else {
 			// panic!("Cannot jump to a block in the present or past")
@@ -223,15 +224,38 @@ impl<
 			});
 		}
 	}
+
+	/// NOTE: this is a workaround function to advance relaychain's block number, since
+	/// `<T as Config>::BlockNumberProvider::set_block_number` is not working in tests
+	///
+	/// It is cloned version of the above trait function implementation in [`cumulus_pallet_parachain_system::RelaychainDataProvider`]
+	///
+	/// TODO: remove this function once the issue is fixed
+	pub fn set_relay_chain_block_number(&mut self, to: BlockNumberFor<T>) {
+		use cumulus_pallet_parachain_system::ValidationData;
+		use cumulus_primitives_core::PersistedValidationData;
+
+		self.execute(|| {
+			let mut validation_data = ValidationData::<T>::get().unwrap_or_else(||
+				// PersistedValidationData does not impl default in non-std
+				PersistedValidationData {
+					parent_head: vec![].into(),
+					relay_parent_number: Default::default(),
+					max_pov_size: Default::default(),
+					relay_parent_storage_root: Default::default(),
+				});
+			validation_data.relay_parent_number = to.saturated_into();
+			ValidationData::<T>::put(validation_data)
+		});
+	}
 }
 
 // assertions
 impl<
-		T: Config + pallet_balances::Config<Balance = Balance>,
+		T: Config + pallet_balances::Config<Balance = Balance> + cumulus_pallet_parachain_system::Config,
 		AllPalletsWithoutSystem: OnFinalize<BlockNumberFor<T>> + OnIdle<BlockNumberFor<T>> + OnInitialize<BlockNumberFor<T>>,
-		BNProvider: BlockNumberProvider<BlockNumber = frame_system::pallet_prelude::BlockNumberFor<T>>,
 		RuntimeEvent: From<Event<T>> + TryInto<Event<T>> + Parameter + Member + IsType<<T as frame_system::Config>::RuntimeEvent>,
-	> Instantiator<T, AllPalletsWithoutSystem, BNProvider, RuntimeEvent>
+	> Instantiator<T, AllPalletsWithoutSystem, RuntimeEvent>
 {
 	pub fn test_ct_created_for(&mut self, project_id: ProjectId) {
 		self.execute(|| {
@@ -335,11 +359,10 @@ impl<
 
 // project chain interactions
 impl<
-		T: Config + pallet_balances::Config<Balance = Balance>,
+		T: Config + pallet_balances::Config<Balance = Balance> + cumulus_pallet_parachain_system::Config,
 		AllPalletsWithoutSystem: OnFinalize<BlockNumberFor<T>> + OnIdle<BlockNumberFor<T>> + OnInitialize<BlockNumberFor<T>>,
-		BNProvider: BlockNumberProvider<BlockNumber = frame_system::pallet_prelude::BlockNumberFor<T>>,
 		RuntimeEvent: From<Event<T>> + TryInto<Event<T>> + Parameter + Member + IsType<<T as frame_system::Config>::RuntimeEvent>,
-	> Instantiator<T, AllPalletsWithoutSystem, BNProvider, RuntimeEvent>
+	> Instantiator<T, AllPalletsWithoutSystem, RuntimeEvent>
 {
 	pub fn get_issuer(&mut self, project_id: ProjectId) -> AccountIdOf<T> {
 		self.execute(|| ProjectsDetails::<T>::get(project_id).unwrap().issuer_account)

pallets/funding/src/instantiator/chain_interactions.rs

@@ -3,7 +3,6 @@ use super::*;
 use crate::ParticipationMode;
 use frame_support::{Deserialize, Serialize};
 use polimec_common::assets::AcceptedFundingAsset;
-use sp_runtime::traits::BlockNumberProvider;
 
 pub type RuntimeOriginOf<T> = <T as frame_system::Config>::RuntimeOrigin;
 pub struct BoxToFunction(pub Box<dyn FnOnce()>);
@@ -20,14 +19,13 @@ pub type OptionalExternalities = Option<RefCell<sp_io::TestExternalities>>;
 pub type OptionalExternalities = Option<()>;
 
 pub struct Instantiator<
-	T: Config + pallet_balances::Config<Balance = Balance>,
+	T: Config + pallet_balances::Config<Balance = Balance> + cumulus_pallet_parachain_system::Config,
 	AllPalletsWithoutSystem: OnFinalize<BlockNumberFor<T>> + OnIdle<BlockNumberFor<T>> + OnInitialize<BlockNumberFor<T>>,
-	BNProvider: BlockNumberProvider<BlockNumber = frame_system::pallet_prelude::BlockNumberFor<T>>,
 	RuntimeEvent: From<Event<T>> + TryInto<Event<T>> + Parameter + Member + IsType<<T as frame_system::Config>::RuntimeEvent>,
 > {
 	pub ext: OptionalExternalities,
 	pub nonce: RefCell<u64>,
-	pub _marker: PhantomData<(T, AllPalletsWithoutSystem, BNProvider, RuntimeEvent)>,
+	pub _marker: PhantomData<(T, AllPalletsWithoutSystem, RuntimeEvent)>,
 }
 
 impl<T: Config + pallet_balances::Config> Deposits<T> for Vec<AccountIdOf<T>> {

pallets/funding/src/instantiator/types.rs

@@ -26,7 +26,7 @@ use frame_support::{
 	construct_runtime, derive_impl,
 	pallet_prelude::Weight,
 	parameter_types,
-	traits::{AsEnsureOriginWithArg, ConstU16, ConstU32, ConstU64, OriginTrait, WithdrawReasons},
+	traits::{AsEnsureOriginWithArg, ConstU16, ConstU32, ConstU64, EnqueueWithOrigin, OriginTrait, WithdrawReasons},
 	PalletId,
 };
 use frame_system as system;
@@ -227,10 +227,27 @@ impl system::Config for TestRuntime {
 	type Hashing = BlakeTwo256;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
 	type PalletInfo = PalletInfo;
 	type SS58Prefix = ConstU16<41>;
 }
 
+// NOTE: this is not used in the mock runtime at all, but it is required to satisfy type bound of [`crate::instantiator::Instantiator`]
+// TODO: should be removed and `<T as crate::Config>::BlockNumberProvider::set_block_number` should be used instead
+impl cumulus_pallet_parachain_system::Config for TestRuntime {
+	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::AnyRelayNumber;
+	type ConsensusHook = cumulus_pallet_parachain_system::ExpectParentIncluded;
+	type DmpQueue = EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
+	type OnSystemEvent = ();
+	type OutboundXcmpMessageSource = ();
+	type ReservedDmpWeight = ();
+	type ReservedXcmpWeight = ();
+	type RuntimeEvent = RuntimeEvent;
+	type SelfParaId = ();
+	type WeightInfo = ();
+	type XcmpMessageHandler = ();
+}
+
 parameter_types! {
 	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
 }
@@ -437,6 +454,9 @@ construct_runtime!(
 		ForeignAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
 		PolimecFunding: pallet_funding::{Pallet, Call, Storage, Event<T>, HoldReason}  = 52,
 		ProxyBonding: pallet_proxy_bonding,
+
+		// NOTE: this pallet is only necessary to satisfy type bound of [`crate::instantiator::Instantiator`]
+		ParachainSystem: cumulus_pallet_parachain_system,
 	}
 );
 

pallets/funding/src/mock.rs

@@ -52,7 +52,7 @@ mod runtime_api;
 mod settlement;
 
 pub type MockInstantiator =
-	Instantiator<TestRuntime, <TestRuntime as crate::Config>::AllPalletsWithoutSystem, System, RuntimeEvent>;
+	Instantiator<TestRuntime, <TestRuntime as crate::Config>::AllPalletsWithoutSystem, RuntimeEvent>;
 pub const CT_DECIMALS: u8 = 15;
 pub const CT_UNIT: u128 = 10_u128.pow(CT_DECIMALS as u32);
 pub const USDT_UNIT: u128 = USD_UNIT;