Skip to content
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

Jump to bottom

Minor refactoring for better readability #496

Merged
merged 1 commit into from May 25, 2022
Merged

Minor refactoring for better readability #496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 11 additions & 17 deletions cumulus/client/cirrus-executor/src/aux_schema.rs
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ use codec::{Decode, Encode};
use sc_client_api::backend::AuxStore;
use sp_blockchain::{Error as ClientError, Result as ClientResult};
use sp_executor::ExecutionReceipt;
use sp_runtime::traits::{Block as BlockT, NumberFor, One, SaturatedConversion, Saturating};
use sp_runtime::traits::{Block as BlockT, NumberFor, One, SaturatedConversion};
use subspace_core_primitives::BlockNumber;

const EXECUTION_RECEIPT_KEY: &[u8] = b"execution_receipt";
Expand Down Expand Up @@ -50,18 +50,17 @@ pub(super) fn write_execution_receipt<Backend: AuxStore, Block: BlockT, PBlock:

let mut new_first_saved_receipt = first_saved_receipt;

let keys_to_delete = if best_execution_chain_number.saturating_sub(first_saved_receipt) >=
PRUNING_DEPTH.into()
{
// `first_saved_receipt` starts from 1 instead of 0, hence `PRUNING_DEPTH` - 1.
new_first_saved_receipt =
best_execution_chain_number.saturating_sub((PRUNING_DEPTH - 1).saturated_into());
let mut keys_to_delete = vec![];

let mut keys_to_delete = vec![];
let mut to_delete_start = first_saved_receipt;
while to_delete_start < new_first_saved_receipt {
if let Some(delete_receipts_to) = best_execution_chain_number
.saturated_into::<BlockNumber>()
.checked_sub(PRUNING_DEPTH)
{
new_first_saved_receipt = Into::<NumberFor<Block>>::into(delete_receipts_to) + One::one();
for receipt_to_delete in first_saved_receipt.saturated_into()..=delete_receipts_to {
let delete_block_number_key =
(EXECUTION_RECEIPT_BLOCK_NUMBER, to_delete_start).encode();
(EXECUTION_RECEIPT_BLOCK_NUMBER, receipt_to_delete).encode();

if let Some(hashes_to_delete) =
load_decode::<_, Vec<Block::Hash>>(backend, delete_block_number_key.as_slice())?
{
Expand All @@ -70,13 +69,8 @@ pub(super) fn write_execution_receipt<Backend: AuxStore, Block: BlockT, PBlock:
);
keys_to_delete.push(delete_block_number_key);
}
to_delete_start = to_delete_start.saturating_add(One::one());
}

keys_to_delete
} else {
vec![]
};
}

backend.insert_aux(
&[
Expand Down