diff --git a/internal/mempool/mempool.go b/internal/mempool/mempool.go index 6fd5f0f3..6c980124 100644 --- a/internal/mempool/mempool.go +++ b/internal/mempool/mempool.go @@ -1351,7 +1351,7 @@ func (mp *TxPool) maybeAcceptTransaction(tx *dcrutil.Tx, isNew, rateLimit, medianTime := mp.cfg.PastMedianTime() if !mp.cfg.Policy.AcceptNonStd { err := checkTransactionStandard(tx, txType, nextBlockHeight, - medianTime, mp.cfg.Policy.MinRelayTxFee, isTreasuryEnabled) + medianTime, mp.cfg.Policy.MinRelayTxFee) if err != nil { str := fmt.Sprintf("transaction %v is not standard: %v", txHash, err) diff --git a/internal/mempool/policy.go b/internal/mempool/policy.go index 04bfd575..5f73e695 100644 --- a/internal/mempool/policy.go +++ b/internal/mempool/policy.go @@ -296,8 +296,7 @@ func isDust(txOut *wire.TxOut, minRelayTxFee dcrutil.Amount) bool { // Note: all non-nil errors MUST be RuleError with an underlying TxRuleError // instance. func checkTransactionStandard(tx *dcrutil.Tx, txType stake.TxType, height int64, - medianTime time.Time, minRelayTxFee dcrutil.Amount, - isTreasuryEnabled bool) error { + medianTime time.Time, minRelayTxFee dcrutil.Amount) error { // The transaction must be a currently supported serialize type. msgTx := tx.MsgTx() diff --git a/internal/mempool/policy_test.go b/internal/mempool/policy_test.go index 4382a068..affc475a 100644 --- a/internal/mempool/policy_test.go +++ b/internal/mempool/policy_test.go @@ -525,7 +525,7 @@ func TestCheckTransactionStandard(t *testing.T) { txType := stake.DetermineTxType(&test.tx, noTreasury, noAutoRevocations) tx := dcrutil.NewTx(&test.tx) err := checkTransactionStandard(tx, txType, test.height, medianTime, - DefaultMinRelayTxFee, noTreasury) + DefaultMinRelayTxFee) if err == nil && test.isStandard { // Test passes since function returned standard for a // transaction which is intended to be standard. diff --git a/internal/mining/mining_harness_test.go b/internal/mining/mining_harness_test.go index 09b5a2f7..46ff1048 100644 --- a/internal/mining/mining_harness_test.go +++ b/internal/mining/mining_harness_test.go @@ -426,7 +426,7 @@ func (p *fakeTxSource) fetchRedeemers(outpoints map[wire.OutPoint]*dcrutil.Tx, } // addOrphan adds the passed orphan transaction to the orphan pool. -func (p *fakeTxSource) addOrphan(tx *dcrutil.Tx, isTreasuryEnabled bool) { +func (p *fakeTxSource) addOrphan(tx *dcrutil.Tx) { p.orphans[*tx.Hash()] = tx for _, txIn := range tx.MsgTx().TxIn { if _, exists := p.orphansByPrev[txIn.PreviousOutPoint]; !exists { @@ -438,7 +438,7 @@ func (p *fakeTxSource) addOrphan(tx *dcrutil.Tx, isTreasuryEnabled bool) { } // removeOrphan removes the passed orphan transaction from the orphan pool. -func (p *fakeTxSource) removeOrphan(tx *dcrutil.Tx, removeRedeemers bool, isTreasuryEnabled bool) { +func (p *fakeTxSource) removeOrphan(tx *dcrutil.Tx, removeRedeemers bool) { // Nothing to do if the passed tx does not exist in the orphan pool. txHash := tx.Hash() tx, exists := p.orphans[*txHash] @@ -466,7 +466,7 @@ func (p *fakeTxSource) removeOrphan(tx *dcrutil.Tx, removeRedeemers bool, isTrea for txOutIdx := range tx.MsgTx().TxOut { prevOut.Index = uint32(txOutIdx) for _, orphan := range p.orphansByPrev[prevOut] { - p.removeOrphan(orphan, true, isTreasuryEnabled) + p.removeOrphan(orphan, true) } } } @@ -480,11 +480,11 @@ func (p *fakeTxSource) removeOrphan(tx *dcrutil.Tx, removeRedeemers bool, isTrea // to removing all orphans which rely on them, recursively. This is necessary // when a transaction is added to the main pool because it may spend outputs // that orphans also spend. -func (p *fakeTxSource) removeOrphanDoubleSpends(tx *dcrutil.Tx, isTreasuryEnabled bool) { +func (p *fakeTxSource) removeOrphanDoubleSpends(tx *dcrutil.Tx) { msgTx := tx.MsgTx() for _, txIn := range msgTx.TxIn { for _, orphan := range p.orphansByPrev[txIn.PreviousOutPoint] { - p.removeOrphan(orphan, true, isTreasuryEnabled) + p.removeOrphan(orphan, true) } } } @@ -839,7 +839,7 @@ func (p *fakeTxSource) processOrphans(acceptedTx *dcrutil.Tx, isTreasuryEnabled, if err != nil { // The orphan is now invalid, so there is no way any other orphans which // redeem any of its outputs can be accepted. Remove them. - p.removeOrphan(tx, true, isTreasuryEnabled) + p.removeOrphan(tx, true) break } @@ -855,7 +855,7 @@ func (p *fakeTxSource) processOrphans(acceptedTx *dcrutil.Tx, isTreasuryEnabled, // remove it from the orphan pool, and add it to the list of transactions to // process so any orphans that depend on it are handled too. acceptedTxns = append(acceptedTxns, tx) - p.removeOrphan(tx, false, isTreasuryEnabled) + p.removeOrphan(tx, false) processList = append(processList, tx) // Only one transaction for this outpoint can be accepted, so the rest are @@ -867,9 +867,9 @@ func (p *fakeTxSource) processOrphans(acceptedTx *dcrutil.Tx, isTreasuryEnabled, // Recursively remove any orphans that also redeem any outputs redeemed by the // accepted transactions since those are now definitive double spends. - p.removeOrphanDoubleSpends(acceptedTx, isTreasuryEnabled) + p.removeOrphanDoubleSpends(acceptedTx) for _, tx := range acceptedTxns { - p.removeOrphanDoubleSpends(tx, isTreasuryEnabled) + p.removeOrphanDoubleSpends(tx) } return acceptedTxns @@ -901,7 +901,7 @@ func (p *fakeTxSource) ProcessTransaction(tx *dcrutil.Tx) ([]*dcrutil.Tx, error) } // Add the orphan transaction to the tx source. - p.addOrphan(tx, isTreasuryEnabled) + p.addOrphan(tx) return nil, err }