pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 11:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

block.tx[0] is not invalid if on_initialize is too heavy (#6217)

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2020-06-02 20:07:10 +03:00
committed by GitHub
parent 4adac40c07
commit b800909dae
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/basic-authorship/src/basic_authorship.rs
+1 -7
View File
@@ -225,7 +225,6 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
// proceed with transactions
let block_timer = time::Instant::now();
let mut is_first = true;
let mut skipped = 0;
let mut unqueue_invalid = Vec::new();
let pending_iterator = match executor::block_on(future::select(
@@ -261,10 +260,7 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
}
Err(ApplyExtrinsicFailed(Validity(e)))
if e.exhausted_resources() => {
if is_first {
debug!("[{:?}] Invalid transaction: FullBlock on empty block", pending_tx_hash);
unqueue_invalid.push(pending_tx_hash);
} else if skipped < MAX_SKIPPED_TRANSACTIONS {
if skipped < MAX_SKIPPED_TRANSACTIONS {
skipped += 1;
debug!(
"Block seems full, but will try {} more transactions before quitting.",
@@ -287,8 +283,6 @@ impl<A, B, Block, C> Proposer<B, Block, C, A>
unqueue_invalid.push(pending_tx_hash);
}
}
is_first = false;
}
self.transaction_pool.remove_invalid(&unqueue_invalid);