Skip to content

Commit fc6628f

Browse files
committed
Fix incorrect rebase of fix/wallet_remove_conflicting_txs
1 parent 2729c09 commit fc6628f

File tree

1 file changed

+0
-26
lines changed
  • wallet/src/account/output_cache

1 file changed

+0
-26
lines changed

wallet/src/account/output_cache/mod.rs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,32 +1570,6 @@ impl OutputCache {
15701570
}
15711571
}
15721572

1573-
for output in tx.outputs() {
1574-
match output {
1575-
TxOutput::CreateStakePool(pool_id, _) => {
1576-
self.pools.remove(pool_id);
1577-
}
1578-
TxOutput::ProduceBlockFromStake(_, pool_id) => {
1579-
if self.pools.contains_key(pool_id) {
1580-
let latest_utxo = self.find_latest_utxo_for_pool(*pool_id);
1581-
if let Some(pool_data) = self.pools.get_mut(pool_id) {
1582-
pool_data.utxo_outpoint = latest_utxo.expect("must be present");
1583-
}
1584-
}
1585-
}
1586-
TxOutput::Burn(_)
1587-
| TxOutput::Transfer(_, _)
1588-
| TxOutput::IssueNft(_, _, _)
1589-
| TxOutput::DataDeposit(_)
1590-
| TxOutput::DelegateStaking(_, _)
1591-
| TxOutput::LockThenTransfer(_, _, _)
1592-
| TxOutput::CreateDelegationId(_, _)
1593-
| TxOutput::IssueFungibleToken(_)
1594-
| TxOutput::Htlc(_, _)
1595-
| TxOutput::CreateOrder(_) => {}
1596-
}
1597-
}
1598-
15991573
for output in tx.outputs().iter().rev() {
16001574
match output {
16011575
TxOutput::CreateStakePool(pool_id, _) => {

0 commit comments

Comments
 (0)