Vtoken voting test

pallets/vtoken-voting/src/lib.rs

@@ -175,7 +175,7 @@ pub mod pallet {
 			poll_index: PollIndex,
 			success: bool,
 		},
-		DelegatorTokenUnlockNotified {
+		DelegatorVoteRemovedNotified {
 			vtoken: CurrencyIdOf<T>,
 			poll_index: PollIndex,
 			success: bool,
@@ -696,7 +696,7 @@ pub mod pallet {
 						},
 					)?;
 				}
-				Self::deposit_event(Event::<T>::DelegatorTokenUnlockNotified {
+				Self::deposit_event(Event::<T>::DelegatorVoteRemovedNotified {
 					vtoken,
 					poll_index,
 					success,
@@ -977,9 +977,14 @@ pub mod pallet {
 				Some(ReferendumInfo::Completed(moment)) => {
 					let locking_period =
 						VoteLockingPeriod::<T>::get(vtoken).ok_or(Error::<T>::NoData)?;
+					ensure!(
+						T::RelaychainBlockNumberProvider::current_block_number() >=
+							moment.saturating_add(locking_period),
+						Error::<T>::NotExpired
+					);
 					Ok(moment.saturating_add(locking_period))
 				},
-				_ => Err(Error::<T>::NotCompleted.into()),
+				_ => Err(Error::<T>::NotExpired.into()),
 			}
 		}
 

pallets/vtoken-voting/src/mock.rs

@@ -39,7 +39,7 @@ use pallet_xcm::EnsureResponse;
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
-	traits::{BlakeTwo256, ConstU32, IdentityLookup},
+	traits::{BlakeTwo256, BlockNumberProvider, ConstU32, IdentityLookup},
 };
 use xcm::{prelude::*, v3::Weight as XcmWeight};
 use xcm_builder::FixedWeightBounds;
@@ -274,6 +274,26 @@ impl DerivativeAccountHandler<Runtime> for DerivativeAccount {
 	}
 }
 
+parameter_types! {
+	pub static RelaychainBlockNumber: BlockNumber = 1;
+}
+
+pub struct RelaychainDataProvider;
+
+impl RelaychainDataProvider {
+	pub fn set_block_number(block: BlockNumber) {
+		RelaychainBlockNumber::set(block);
+	}
+}
+
+impl BlockNumberProvider for RelaychainDataProvider {
+	type BlockNumber = BlockNumber;
+
+	fn current_block_number() -> Self::BlockNumber {
+		RelaychainBlockNumber::get()
+	}
+}
+
 impl vtoken_voting::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
@@ -283,7 +303,7 @@ impl vtoken_voting::Config for Runtime {
 	type ResponseOrigin = EnsureResponse<Everything>;
 	type XcmDestWeightAndFee = XcmDestWeightAndFee;
 	type DerivativeAccount = DerivativeAccount;
-	type RelaychainBlockNumberProvider = System;
+	type RelaychainBlockNumberProvider = RelaychainDataProvider;
 	type MaxVotes = ConstU32<3>;
 	type ParachainId = ParachainId;
 	type QueryTimeout = QueryTimeout;