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

fix(hardfork): tx-pool clear statistical data before re-run all transactions #3129

Merged
merged 1 commit into from
Oct 22, 2021
Merged

fix(hardfork): tx-pool clear statistical data before re-run all transactions #3129

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions chain/src/tests/txs_verify_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,15 +265,19 @@ fn refresh_txs_verify_cache_after_hardfork() {
let tx_pool = shared.tx_pool_controller();

let tx = build_tx(&input_tx, &cell_deps, &lock_script);
let tx_size = tx.data().serialized_size_in_block();
tx_pool.submit_local_tx(tx.clone()).unwrap().unwrap();

// at start of the test, the script should be ran with vm0
{
let raw_tx_pool = tx_pool.get_all_entry_info().unwrap();
let tx_pool_entries = tx_pool.get_all_entry_info().unwrap();
let mut counter = 0;
loop {
if let Some(tx_entry) = raw_tx_pool.pending.get(&tx.hash()) {
if let Some(tx_entry) = tx_pool_entries.pending.get(&tx.hash()) {
assert_eq!(tx_entry.cycles, CYCLES_IN_VM0);
let tx_pool_info = tx_pool.get_tx_pool_info().unwrap();
assert_eq!(tx_pool_info.total_tx_size, tx_size);
assert_eq!(tx_pool_info.total_tx_cycles, CYCLES_IN_VM0);
break;
}
// wait tx_pool if got `None`
Expand Down Expand Up @@ -301,8 +305,8 @@ fn refresh_txs_verify_cache_after_hardfork() {
};
let mut counter = 0;
loop {
let raw_tx_pool = tx_pool.get_all_entry_info().unwrap();
if let Some(tx_entry) = raw_tx_pool.pending.get(&tx.hash()) {
let tx_pool_entries = tx_pool.get_all_entry_info().unwrap();
if let Some(tx_entry) = tx_pool_entries.pending.get(&tx.hash()) {
assert_eq!(
tx_entry.cycles,
cycles_expected,
Expand All @@ -312,6 +316,9 @@ fn refresh_txs_verify_cache_after_hardfork() {
cycles_expected,
tx_entry.cycles,
);
let tx_pool_info = tx_pool.get_tx_pool_info().unwrap();
assert_eq!(tx_pool_info.total_tx_size, tx_size);
assert_eq!(tx_pool_info.total_tx_cycles, cycles_expected);
break;
}
// wait tx_pool if got `None`
Expand All @@ -331,8 +338,11 @@ fn refresh_txs_verify_cache_after_hardfork() {

// at last of the test, the script should be ran with vm1
{
let raw_tx_pool = tx_pool.get_all_entry_info().unwrap();
let tx_entry = raw_tx_pool.pending.get(&tx.hash()).unwrap();
let tx_pool_entries = tx_pool.get_all_entry_info().unwrap();
let tx_entry = tx_pool_entries.pending.get(&tx.hash()).unwrap();
assert_eq!(tx_entry.cycles, CYCLES_IN_VM1);
let tx_pool_info = tx_pool.get_tx_pool_info().unwrap();
assert_eq!(tx_pool_info.total_tx_size, tx_size);
assert_eq!(tx_pool_info.total_tx_cycles, CYCLES_IN_VM1);
}
}
3 changes: 3 additions & 0 deletions tx-pool/src/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,9 @@ impl TxPool {
self.proposed.clear();
txs.append(&mut self.gap.drain());
txs.append(&mut self.pending.drain());
self.total_tx_size = 0;
self.total_tx_cycles = 0;
self.touch_last_txs_updated_at();
txs
}

Expand Down