highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6915

Browse Source 
2d8860e Fix removeForReorg to use MedianTimePast (Suhas Daftuar)
b7fa4aa Don't call removeForReorg if DisconnectTip fails (Suhas Daftuar)
7e49f5f Track coinbase spends in CTxMemPoolEntry (Suhas Daftuar)
bb8ea1f removeForReorg calls once-per-disconnect-> once-per-reorg (Matt Corallo)
474b84a Make indentation in ActivateBestChainStep readable (Matt Corallo)
b0a064c Fix comment in removeForReorg (Matt Corallo)
9b060e5 Fix removal of time-locked transactions during reorg (Matt Corallo)
0c9959a Add failing test checking timelocked-txn removal during reorg (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan
2015-12-01 12:41:57 +01:00
parent 9afbd96919 2d8860e820
commit 2ef5ffa59a
9 changed files with 115 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qa/pull-tester/rpc-tests.py
View File

@@ -82,7 +82,7 @@ testScripts = [
'rawtransactions.py',
'rest.py',
'mempool_spendcoinbase.py',
'mempool_coinbase_spends.py',
'mempool_reorg.py',
'httpbasics.py',
'multi_rpc.py',
'zapwallettxes.py',