difftreelog
style(Scheduler) removed unlikely to be used commented chunks of code
in: master
3 files changed
pallets/scheduler/src/lib.rsdiffbeforeafterboth--- a/pallets/scheduler/src/lib.rs
+++ b/pallets/scheduler/src/lib.rs
@@ -159,15 +159,6 @@
/// The location of a scheduled task that can be used to remove it.
pub type TaskAddress<BlockNumber> = (BlockNumber, u32);
-/*#[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))] todo remove completely?
-#[derive(Clone, RuntimeDebug, Encode, Decode)]
-struct ScheduledV1<Call, BlockNumber> {
- maybe_id: Option<Vec<u8>>,
- priority: schedule::Priority,
- call: Call,
- maybe_periodic: Option<schedule::Period<BlockNumber>>,
-}*/
-
/// Information regarding an item to be executed in the future.
#[cfg_attr(any(feature = "std", test), derive(PartialEq, Eq))]
#[derive(Clone, RuntimeDebug, Encode, Decode, TypeInfo)]
@@ -185,27 +176,8 @@
/// The information regarding the call's preparation for dispatch, in particular the fee, to be sent to post-dispatch.
pre_dispatch: PreDispatch,
_phantom: PhantomData<AccountId>,
-}
-
-/// The current version of Scheduled struct.
-/*pub type Scheduled<Call, BlockNumber, PalletsOrigin, AccountId, PreDispatch> =
- ScheduledV2<Call, BlockNumber, PalletsOrigin, AccountId, PreDispatch>;*/
-
-// A value placed in storage that represents the current version of the Scheduler storage.
-// This value is used by the `on_runtime_upgrade` logic to determine whether we run
-// storage migration logic.
-/*#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, TypeInfo)] todo remove completely?
-enum Releases {
- V1,
- V2,
}
-impl Default for Releases {
- fn default() -> Self {
- Releases::V1
- }
-}*/
-
#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
pub struct CallSpec {
module: u32,
@@ -223,17 +195,9 @@
T::AccountId,
<<T as Config>::CallExecutor as DispatchCall<T, H160>>::Pre
>>>;
-
- /*pub SpecAgenda: map hasher(twox_64_concat) T::BlockNumber todo remove completely?
- => Vec<Option<CallSpec>>;*/
-
+
/// Lookup from identity to the block number and index of the task.
Lookup: map hasher(twox_64_concat) Vec<u8> => Option<TaskAddress<T::BlockNumber>>;
-
- // / Storage version of the pallet.
- // /
- // / New networks start with last version.
- //StorageVersion build(|_| Releases::V2): Releases; todo remove completely?
}
}
@@ -535,9 +499,9 @@
<<T as Config>::Origin as From<T::PalletsOrigin>>::from(origin.clone()).into(),
)
.unwrap_or_default(); // todo sponsoring doesn't work with the line below -- found sponsoring is already checked for in transaction_payment
- //let who_will_pay = T::SponsorshipHandler::get_sponsor(&sender, &call).unwrap_or(sender);
- //let sponsor = T::PalletsOrigin::from(system::RawOrigin::Signed(who_will_pay.clone()));
- //let r = call.clone().dispatch(sponsor.into());
+ //let who_will_pay = T::SponsorshipHandler::get_sponsor(&sender, &call).unwrap_or(sender);
+ //let sponsor = T::PalletsOrigin::from(system::RawOrigin::Signed(who_will_pay.clone()));
+ //let r = call.clone().dispatch(sponsor.into());
let pre_dispatch = match T::CallExecutor::pre_dispatch(sender.clone(), call.clone()) {
Ok(pre_dispatch) => pre_dispatch,
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -811,19 +811,6 @@
type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;
-/*fn get_signed_extra(from: <Runtime as frame_system::Config>::AccountId) -> SignedExtra {
- (
- frame_system::CheckSpecVersion::<Runtime>::new(),
- frame_system::CheckGenesis::<Runtime>::new(),
- frame_system::CheckEra::<Runtime>::from(Era::Immortal),
- frame_system::CheckNonce::<Runtime>::from(frame_system::Pallet::<Runtime>::account_nonce(
- from,
- )),
- frame_system::CheckWeight::<Runtime>::new(),
- ChargeTransactionPayment::new(0),
- )
-}*/
-
#[derive(Default, Encode, Decode, Clone, TypeInfo)]
pub struct SchedulerPreDispatch {
tip: Balance,
@@ -849,29 +836,12 @@
type Pre = SchedulerPreDispatch;
fn dispatch_call(
- //signer: <T as frame_system::Config>::AccountId,
pre_dispatch: Self::Pre,
call: <T as pallet_unq_scheduler::Config>::Call,
) -> Result<
Result<PostDispatchInfo, DispatchErrorWithPostInfo<PostDispatchInfo>>,
TransactionValidityError,
> {
- /*let dispatch_info = call.get_dispatch_info();
-
- let extrinsic = fp_self_contained::CheckedExtrinsic::<
- AccountId,
- Call,
- SignedExtra,
- SelfContainedSignedInfo,
- > {
- signed: CheckedSignature::<AccountId, SignedExtra, SelfContainedSignedInfo>::Signed(
- signer.clone().into(),
- get_signed_extra(signer.clone().into()),
- ),
- function: call.clone().into(),
- };
-
- extrinsic.apply::<Runtime>(&dispatch_info, 0)*/
let dispatch_info = call.get_dispatch_info();
let pre = (
pre_dispatch.tip,
tests/src/scheduler.test.tsdiffbeforeafterboth27 getTokenOwner,27 getTokenOwner,28 getGenericResult,28 getGenericResult,29 scheduleTransferFundsPeriodicExpectSuccess,29 scheduleTransferFundsPeriodicExpectSuccess,30 setCollectionLimitsExpectSuccess,31 getDetailedCollectionInfo,32 getFreeBalance,30 getFreeBalance,33 confirmSponsorshipByKeyExpectSuccess,31 confirmSponsorshipByKeyExpectSuccess,34} from './util/helpers';32} from './util/helpers';143 });141 });144 });142 });145146 /*it.skip('Going bankrupt after sponsoring a scheduled transaction does not nullify the transaction', async () => {147 await usingApi(async (api) => {148 // Find two empty, unused accounts149 const zeroBalance = await findUnusedAddress(api);150 const zeroBalanceSponsor = await findUnusedAddress(api);151152 const collectionId = await createCollectionExpectSuccess();153154 // Grace these with money, enough to cover future transactions155 const balanceTx = api.tx.balances.transfer(zeroBalance.address, 1n * UNIQUE);156 await submitTransactionAsync(alice, balanceTx);157158 // Grace these with money, enough to cover future transactions159 const balanceSponsorTx = api.tx.balances.transfer(zeroBalanceSponsor.address, 1n * UNIQUE);160 await submitTransactionAsync(alice, balanceSponsorTx);161162 // Set a collection sponsor163 await setCollectionSponsorExpectSuccess(collectionId, zeroBalanceSponsor.address);164 await confirmSponsorshipExpectSuccess(collectionId);165166 // Add zeroBalance address to allow list167 await enablePublicMintingExpectSuccess(alice, collectionId);168 await addToAllowListExpectSuccess(alice, collectionId, zeroBalance.address);169170 // Mint a fresh NFT171 const tokenId = await createItemExpectSuccess(zeroBalance, collectionId, 'NFT');172173 // Schedule transfer of the NFT a few blocks ahead174 // const waitForBlocks = 4;175 await scheduleTransferExpectSuccess(collectionId, tokenId, zeroBalance, alice, 1, 4);176 //await waitAfterScheduleExpectSuccess(collectionId, tokenId, alice, 3);177178 // Get rid of the account's funds before the scheduled transaction takes place179 const emptyBalanceSponsorTx = api.tx.balances.setBalance(zeroBalanceSponsor.address, 0, 0);180 const sudoTx = api.tx.sudo.sudo(emptyBalanceSponsorTx as any);181 const events = await submitTransactionAsync(alice, sudoTx);182 expect(getGenericResult(events).success).to.be.true;183184 // Wait for a certain number of blocks, save for the ones that already happened while accepting the late transactions185 await waitNewBlocks(4);186187 expect(await getTokenOwner(api, collectionId, tokenId)).to.be.deep.equal(normalizeAccountId(alice.address));188 });189 });*/190143191 it('Sponsor going bankrupt does not impact a scheduled transaction', async () => {144 it('Sponsor going bankrupt does not impact a scheduled transaction', async () => {192 const collectionId = await createCollectionExpectSuccess();145 const collectionId = await createCollectionExpectSuccess();