Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-11-28 16:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Rename isHighPriority to neverExpires"

Browse Source 
This reverts commit b2da9a4a00c02fb380d2518cf54fa16257bd8423.
This commit is contained in:
Mike Zak 2021-06-07 09:50:26 +03:00
parent e5e266ff0b
commit b412cd9bbc
4 changed files with 15 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
domain/miningmanager/mempool/mempool.go
View File

@ -27,7 +27,7 @@ func newMempool(consensus externalapi.Consensus, dagParams *dagconfig.Params) *m
return mp return mp
} }
func (mp *mempool) ValidateAndInsertTransaction(transaction *externalapi.DomainTransaction, neverExpires bool) ( func (mp *mempool) ValidateAndInsertTransaction(transaction *externalapi.DomainTransaction, isHighPriority bool) (
acceptedTransactions []*externalapi.DomainTransaction, err error) { acceptedTransactions []*externalapi.DomainTransaction, err error) {
panic("mempool.ValidateAndInsertTransaction not implemented") // TODO (Mike) panic("mempool.ValidateAndInsertTransaction not implemented") // TODO (Mike)

5
domain/miningmanager/mempool/model.go
View File

@ -6,12 +6,11 @@ import (
) )
type idToTransaction map[externalapi.DomainTransactionID]*mempoolTransaction type idToTransaction map[externalapi.DomainTransactionID]*mempoolTransaction
type idToOrphan map[externalapi.DomainTransactionID]*orphanTransaction
type mempoolTransaction struct { type mempoolTransaction struct {
transaction *externalapi.DomainTransaction transaction *externalapi.DomainTransaction
parentsInPool idToTransaction parentsInPool idToTransaction
neverExpires bool isHighPriority bool
addAtDAAScore uint64 addAtDAAScore uint64
} }
@ -21,7 +20,7 @@ func (mt *mempoolTransaction) transactionID() *externalapi.DomainTransactionID {
type orphanTransaction struct { type orphanTransaction struct {
transaction *externalapi.DomainTransaction transaction *externalapi.DomainTransaction
neverExpires bool isHighPriority bool
addedAtDAAScore uint64 addedAtDAAScore uint64
} }

47
domain/miningmanager/mempool/orphan_pool.go
View File

@ -1,14 +1,12 @@
package mempool package mempool
import ( import "github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
"github.com/kaspanet/kaspad/domain/consensus/model/externalapi"
)
type previousOutpointToOrphans map[externalapi.DomainOutpoint]idToOrphan type previousOutpointToOrphans map[externalapi.DomainOutpoint]idToTransaction
type orphansPool struct { type orphansPool struct {
mempool *mempool mempool *mempool
allOrphans idToOrphan allOrphans idToTransaction
orphanByPreviousOutpoint previousOutpointToOrphans orphanByPreviousOutpoint previousOutpointToOrphans
lastExpireScan uint64 lastExpireScan uint64
} }
@ -16,14 +14,14 @@ type orphansPool struct {
func newOrphansPool(mp *mempool) *orphansPool { func newOrphansPool(mp *mempool) *orphansPool {
return &orphansPool{ return &orphansPool{
mempool: mp, mempool: mp,
allOrphans: idToOrphan{}, allOrphans: idToTransaction{},
orphanByPreviousOutpoint: previousOutpointToOrphans{}, orphanByPreviousOutpoint: previousOutpointToOrphans{},
lastExpireScan: 0, lastExpireScan: 0,
} }
} }
func (op *orphansPool) maybeAddOrphan(transaction *externalapi.DomainTransaction, func (op *orphansPool) maybeAddOrphan(transaction *externalapi.DomainTransaction,
missingParents []*externalapi.DomainTransactionID, neverExpires bool) error { missingParents []*externalapi.DomainTransactionID, isHighPriority bool) error {
panic("orphansPool.maybeAddOrphan not implemented") // TODO (Mike) panic("orphansPool.maybeAddOrphan not implemented") // TODO (Mike)
} }
@ -38,37 +36,8 @@ func (op *orphansPool) unorphanTransaction(orphanTransactionID *externalapi.Doma
panic("orphansPool.unorphanTransaction not implemented") // TODO (Mike) panic("orphansPool.unorphanTransaction not implemented") // TODO (Mike)
} }
func (op *orphansPool) removeOrphan(orphanTransactionID *externalapi.DomainTransactionID, removeRedeemers bool) { func (op *orphansPool) removeOrphan(orphanTransactionID *externalapi.DomainTransactionID) error {
var orphanTransaction *orphanTransaction panic("orphansPool.removeOrphan not implemented") // TODO (Mike)
var ok bool
if orphanTransaction, ok = op.allOrphans[*orphanTransactionID]; !ok {
return
}
// Remove orphan from allOrphans
delete(op.allOrphans, *orphanTransactionID)
// Remove orphan from all relevant entries in orphanByPreviousOutpoint
for _, input := range orphanTransaction.transaction.Inputs {
if orphans, ok := op.orphanByPreviousOutpoint[input.PreviousOutpoint]; ok {
delete(orphans, orphanTransactionID)
if len(orphans) == 0 {
delete(op.orphanByPreviousOutpoint, input.PreviousOutpoint)
}
}
}
// Recursively remove redeemers if requested.
// Since the size of the orphan pool is very limited - the recursion depth is properly bound.
if removeRedeemers {
outpoint := externalapi.DomainOutpoint{TransactionID: *orphanTransactionID}
for i := range orphanTransaction.transaction.Outputs {
outpoint.Index = uint32(i)
for _, orphanRedeemer := range op.orphanByPreviousOutpoint[outpoint] {
op.removeOrphan(orphanRedeemer.transactionID(), true)
}
}
}
} }
func (op *orphansPool) expireOrphanTransactions() error { func (op *orphansPool) expireOrphanTransactions() error {
@ -83,7 +52,7 @@ func (op *orphansPool) expireOrphanTransactions() error {
for _, orphanTransaction := range op.allOrphans { for _, orphanTransaction := range op.allOrphans {
// Never expire high priority transactions // Never expire high priority transactions
if orphanTransaction.neverExpires { if orphanTransaction.isHighPriority {
continue continue
} }

2
domain/miningmanager/mempool/transactions_pool.go
View File

@ -48,7 +48,7 @@ func (tp *transactionsPool) expireOldTransactions() error {
for _, mempoolTransaction := range tp.allTransactions { for _, mempoolTransaction := range tp.allTransactions {
// Never expire high priority transactions // Never expire high priority transactions
if mempoolTransaction.neverExpires { if mempoolTransaction.isHighPriority {
continue continue
} }