Skip to content

Commit

Permalink
Merge #2923 #2924
Browse files Browse the repository at this point in the history
2923: fix: callback potentially incorrect trigger on concurrent context r=yangby-cryptape,quake a=zhangsoledad

https://github.com/nervosnetwork/ckb/blob/develop/tx-pool/src/process.rs#L471
https://github.com/nervosnetwork/ckb/blob/develop/tx-pool/src/process.rs#L707-L709 
duplicate checked before submitting, but the lock released later,  there is still potentially inclusion.

2924: fix(test): make sure testnode graceful shutdown basic sync r=quake,yangby-cryptape a=zhangsoledad

tests::synchronizer::basic_sync do not graceful shutdown, may cause 
```
pure virtual method called                                                                                                                                                                   
terminate called without an active exception 
```
bump crossbeam-channel from 0.3.9 to 0.5.1 incidentally.


Co-authored-by: zhangsoledad <[email protected]>
  • Loading branch information
bors[bot] and zhangsoledad authored Aug 10, 2021
3 parents 624d037 + 12eb403 + 626af9b commit 63f0d31
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 134 deletions.
31 changes: 6 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 63f0d31

Please sign in to comment.