File tree 3 files changed +767
-204
lines changed
3 files changed +767
-204
lines changed Original file line number Diff line number Diff line change @@ -1860,16 +1860,10 @@ impl<K: AccountKeyChains> Account<K> {
1860
1860
. txs_with_unconfirmed ( )
1861
1861
. iter ( )
1862
1862
. filter_map ( |( id, tx) | match tx. state ( ) {
1863
- TxState :: Confirmed ( height, _, idx) => {
1864
- if height > common_block_height {
1865
- Some ( (
1866
- AccountWalletTxId :: new ( self . get_account_id ( ) , id. clone ( ) ) ,
1867
- ( height, idx) ,
1868
- ) )
1869
- } else {
1870
- None
1871
- }
1872
- }
1863
+ TxState :: Confirmed ( height, _, idx) => ( height > common_block_height) . then_some ( (
1864
+ AccountWalletTxId :: new ( self . get_account_id ( ) , id. clone ( ) ) ,
1865
+ ( height, idx) ,
1866
+ ) ) ,
1873
1867
TxState :: Inactive ( _)
1874
1868
| TxState :: Conflicted ( _)
1875
1869
| TxState :: InMempool ( _)
@@ -1883,7 +1877,7 @@ impl<K: AccountKeyChains> Account<K> {
1883
1877
for ( tx_id, _) in revoked_txs {
1884
1878
db_tx. del_transaction ( & tx_id) ?;
1885
1879
let source = tx_id. into_item_id ( ) ;
1886
- self . output_cache . remove_tx ( & source) ?;
1880
+ self . output_cache . remove_confirmed_tx ( & source) ?;
1887
1881
wallet_events. del_transaction ( self . account_index ( ) , source) ;
1888
1882
}
1889
1883
You can’t perform that action at this time.
0 commit comments