mining/mempool: Export MinHighPriority from mining.
This move the export for MinHighPriority from the mempool package to the mining package. This should have been done when the priority calculation code was moved to the mining package.
This commit is contained in:
parent
660467259e
commit
a18f883c1f
3 changed files with 11 additions and 10 deletions
|
@ -30,10 +30,6 @@ const (
|
|||
// inclusion when generating block templates.
|
||||
DefaultBlockPrioritySize = 50000
|
||||
|
||||
// MinHighPriority is the minimum priority value that allows a
|
||||
// transaction to be considered high priority.
|
||||
MinHighPriority = btcutil.SatoshiPerBitcoin * 144.0 / 250
|
||||
|
||||
// orphanTTL is the maximum amount of time an orphan is allowed to
|
||||
// stay in the orphan pool before it expires and is evicted during the
|
||||
// next scan.
|
||||
|
@ -797,10 +793,10 @@ func (mp *TxPool) maybeAcceptTransaction(tx *btcutil.Tx, isNew, rateLimit, rejec
|
|||
if isNew && !mp.cfg.Policy.DisableRelayPriority && txFee < minFee {
|
||||
currentPriority := mining.CalcPriority(tx.MsgTx(), utxoView,
|
||||
nextBlockHeight)
|
||||
if currentPriority <= MinHighPriority {
|
||||
if currentPriority <= mining.MinHighPriority {
|
||||
str := fmt.Sprintf("transaction %v has insufficient "+
|
||||
"priority (%g <= %g)", txHash,
|
||||
currentPriority, MinHighPriority)
|
||||
currentPriority, mining.MinHighPriority)
|
||||
return nil, txRuleError(wire.RejectInsufficientFee, str)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@ import (
|
|||
"github.com/btcsuite/btcd/blockchain"
|
||||
"github.com/btcsuite/btcd/chaincfg"
|
||||
"github.com/btcsuite/btcd/chaincfg/chainhash"
|
||||
"github.com/btcsuite/btcd/mempool"
|
||||
"github.com/btcsuite/btcd/mining"
|
||||
"github.com/btcsuite/btcd/txscript"
|
||||
"github.com/btcsuite/btcd/wire"
|
||||
|
@ -638,13 +637,13 @@ mempoolLoop:
|
|||
// the priority size or there are no more high-priority
|
||||
// transactions.
|
||||
if !sortedByFee && (blockPlusTxSize >= policy.BlockPrioritySize ||
|
||||
prioItem.priority <= mempool.MinHighPriority) {
|
||||
prioItem.priority <= mining.MinHighPriority) {
|
||||
|
||||
minrLog.Tracef("Switching to sort by fees per "+
|
||||
"kilobyte blockSize %d >= BlockPrioritySize "+
|
||||
"%d || priority %.2f <= minHighPriority %.2f",
|
||||
blockPlusTxSize, policy.BlockPrioritySize,
|
||||
prioItem.priority, mempool.MinHighPriority)
|
||||
prioItem.priority, mining.MinHighPriority)
|
||||
|
||||
sortedByFee = true
|
||||
priorityQueue.SetLessFunc(txPQByFee)
|
||||
|
@ -656,7 +655,7 @@ mempoolLoop:
|
|||
// final one in the high-priority section, so just fall
|
||||
// though to the code below so it is added now.
|
||||
if blockPlusTxSize > policy.BlockPrioritySize ||
|
||||
prioItem.priority < mempool.MinHighPriority {
|
||||
prioItem.priority < mining.MinHighPriority {
|
||||
|
||||
heap.Push(priorityQueue, prioItem)
|
||||
continue
|
||||
|
|
|
@ -11,6 +11,12 @@ import (
|
|||
"github.com/btcsuite/btcutil"
|
||||
)
|
||||
|
||||
const (
|
||||
// MinHighPriority is the minimum priority value that allows a
|
||||
// transaction to be considered high priority.
|
||||
MinHighPriority = btcutil.SatoshiPerBitcoin * 144.0 / 250
|
||||
)
|
||||
|
||||
// TxDesc is a descriptor about a transaction in a transaction source along with
|
||||
// additional metadata.
|
||||
type TxDesc struct {
|
||||
|
|
Loading…
Reference in a new issue