Skip to content

Change Bundle::receipts from Vec<Receipt> to Receipt #1528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nazar-pc merged 8 commits into from
Jun 12, 2023
Merged

Change Bundle::receipts from Vec<Receipt> to Receipt #1528

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
00aab51
Change Bundle::receipts from Vec<Receipt> to Receipt
NingLin-P Jun 9, 2023
2d4c8cd
Load one receipt for bundle construction
NingLin-P Jun 9, 2023
2fcf4b5
Fix test after changing Vec<Receipt> to Receipt
NingLin-P Jun 9, 2023
6b538a0
Update benchmark for pallect-domains and pallet-domain-registry
NingLin-P Jun 9, 2023
78fa2c3
Apply review suggestion
NingLin-P Jun 11, 2023
3057f14
Merge branch 'main' into bundle-receipt
NingLin-P Jun 11, 2023
106a155
Merge branch 'main' of github.com:subspace/subspace into bundle-receipt
NingLin-P Jun 12, 2023
5f925d2
Merge branch 'main' into bundle-receipt
NingLin-P Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 33 additions & 34 deletions crates/pallet-domains/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,51 @@ use sp_runtime::traits::SaturatedConversion;
mod benchmarks {
use super::*;

// TODO: pick https://github.com/paritytech/substrate/pull/13919 to support generic argument:
// Linear<1, { T::ReceiptsPruningDepth::get() }>
/// Benchmark `submit_bundle` extrinsic with the worst possible conditions:
/// - Submit a system domain bundle
/// - All receipts are new and will prune the same number of expired receipts
/// - The receipts will prune a expired receipt
#[benchmark]
fn submit_system_bundle(x: Linear<1, 256>) {
fn submit_system_bundle() {
let receipts_pruning_depth = T::ReceiptsPruningDepth::get().saturated_into::<u32>();

// Import `ReceiptsPruningDepth` number of receipts which will be pruned later
run_to_block::<T>(1, receipts_pruning_depth);
let receipts: Vec<_> = (0..receipts_pruning_depth)
.map(|i| ExecutionReceipt::dummy(i.into(), block_hash_n::<T>(i)))
.collect();
let bundle = create_dummy_bundle_with_receipts_generic(
DomainId::SYSTEM,
receipts_pruning_depth.into(),
Default::default(),
receipts,
);
assert_ok!(Domains::<T>::submit_bundle(RawOrigin::None.into(), bundle));
for i in 0..receipts_pruning_depth {
let receipt = ExecutionReceipt::dummy(i.into(), block_hash_n::<T>(i));
let bundle = create_dummy_bundle_with_receipts_generic(
DomainId::SYSTEM,
(i + 1).into(),
Default::default(),
receipt,
);
assert_ok!(Domains::<T>::submit_bundle(RawOrigin::None.into(), bundle));
}
assert_eq!(
Domains::<T>::head_receipt_number(),
(receipts_pruning_depth - 1).into()
);

// Construct a bundle that contain `x` number of new receipts
run_to_block::<T>(receipts_pruning_depth + 1, receipts_pruning_depth + x);
let receipts: Vec<_> = (receipts_pruning_depth..(receipts_pruning_depth + x))
.map(|i| ExecutionReceipt::dummy(i.into(), block_hash_n::<T>(i)))
.collect();
// Construct a bundle that contains a new receipt
run_to_block::<T>(receipts_pruning_depth + 1, receipts_pruning_depth + 2);
let receipt = ExecutionReceipt::dummy(
receipts_pruning_depth.into(),
block_hash_n::<T>(receipts_pruning_depth),
);
let bundle = create_dummy_bundle_with_receipts_generic(
DomainId::SYSTEM,
x.into(),
(receipts_pruning_depth + 1).into(),
Default::default(),
receipts,
receipt,
);

#[extrinsic_call]
submit_bundle(RawOrigin::None, bundle);

assert_eq!(
Domains::<T>::head_receipt_number(),
((receipts_pruning_depth + x) - 1).into()
receipts_pruning_depth.into()
);
assert_eq!(Domains::<T>::oldest_receipt_number(), x.into());
assert_eq!(Domains::<T>::oldest_receipt_number(), 1u32.into());
}

#[benchmark]
Expand All @@ -68,7 +67,7 @@ mod benchmarks {
DomainId::CORE_PAYMENTS,
2u32.into(),
Default::default(),
vec![ExecutionReceipt::dummy(1u32.into(), block_hash_n::<T>(1))],
ExecutionReceipt::dummy(1u32.into(), block_hash_n::<T>(1)),
);

#[extrinsic_call]
Expand All @@ -84,16 +83,16 @@ mod benchmarks {

// Import `ReceiptsPruningDepth` number of receipts which will be revert later
run_to_block::<T>(1, receipts_pruning_depth);
let receipts: Vec<_> = (0..receipts_pruning_depth)
.map(|i| ExecutionReceipt::dummy(i.into(), block_hash_n::<T>(i)))
.collect();
let bundle = create_dummy_bundle_with_receipts_generic(
DomainId::SYSTEM,
receipts_pruning_depth.into(),
Default::default(),
receipts,
);
assert_ok!(Domains::<T>::submit_bundle(RawOrigin::None.into(), bundle));
for i in 0..receipts_pruning_depth {
let receipt = ExecutionReceipt::dummy(i.into(), block_hash_n::<T>(i));
let bundle = create_dummy_bundle_with_receipts_generic(
DomainId::SYSTEM,
(i + 1).into(),
Default::default(),
receipt,
);
assert_ok!(Domains::<T>::submit_bundle(RawOrigin::None.into(), bundle));
}
assert_eq!(
Domains::<T>::head_receipt_number(),
(receipts_pruning_depth - 1).into()
Expand Down
Loading