Minor Reversible Pallet Fixes

pallets/reversible-transfers/src/lib.rs

@@ -552,10 +552,10 @@ pub mod pallet {
 		fn validate_delay(delay: &BlockNumberOrTimestampOf<T>) -> DispatchResult {
 			match delay {
 				BlockNumberOrTimestamp::BlockNumber(x) => {
-					ensure!(*x > T::MinDelayPeriodBlocks::get(), Error::<T>::DelayTooShort)
+					ensure!(*x >= T::MinDelayPeriodBlocks::get(), Error::<T>::DelayTooShort)
 				},
 				BlockNumberOrTimestamp::Timestamp(t) => {
-					ensure!(*t > T::MinDelayPeriodMoment::get(), Error::<T>::DelayTooShort)
+					ensure!(*t >= T::MinDelayPeriodMoment::get(), Error::<T>::DelayTooShort)
 				},
 			}
 			Ok(())
@@ -788,7 +788,7 @@ pub mod pallet {
 			};
 			// For assets, burn held funds (fee) and transfer remaining to interceptor
 			// For native balances, burn held funds (fee) and transfer remaining to interceptor
-			if let Ok((call, _)) = T::Preimages::peek::<RuntimeCallOf<T>>(&pending.call) {
+			if let Ok((call, _)) = T::Preimages::realize::<RuntimeCallOf<T>>(&pending.call) {
 				if let Ok(pallet_assets::Call::transfer_keep_alive { id, .. }) =
 					call.clone().try_into()
 				{

pallets/reversible-transfers/src/tests/test_reversible_transfers.rs

@@ -1992,3 +1992,33 @@ fn cancelled_reversible_transfer_does_not_record_proof() {
 		);
 	});
 }
+
+#[test]
+fn validate_delay_accepts_delay_equal_to_minimum() {
+	new_test_ext().execute_with(|| {
+		let user = charlie();
+		let interceptor = dave();
+		let delay = BlockNumberOrTimestamp::BlockNumber(MinDelayPeriodBlocks::get());
+
+		assert_ok!(ReversibleTransfers::set_high_security(
+			RuntimeOrigin::signed(user),
+			delay,
+			interceptor,
+		));
+	});
+}
+
+#[test]
+fn validate_delay_accepts_timestamp_equal_to_minimum() {
+	new_test_ext().execute_with(|| {
+		let user = charlie();
+		let interceptor = dave();
+		let delay = BlockNumberOrTimestamp::Timestamp(MinDelayPeriodMoment::get());
+
+		assert_ok!(ReversibleTransfers::set_high_security(
+			RuntimeOrigin::signed(user),
+			delay,
+			interceptor,
+		));
+	});
+}