Skip to content

multi: Use builtin min and max. #3736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davecgh merged 1 commit into from
Jul 16, 2026
+16 −52
Merged

multi: Use builtin min and max. #3736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions internal/blockchain/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,15 +1150,6 @@ func (g *chaingenHarness) ReconsiderBlockAndExpectTip(blockName string, wantErr
g.ExpectTip(tipName)
}

// minUint32 is a helper function to return the minimum of two uint32s.
// This avoids a math import and the need to cast to floats.
func minUint32(a, b uint32) uint32 {
if a < b {
return a
}
return b
}

// generateToHeight generates enough blocks in the generator associated with the
// harness to reach the provided height assuming the blocks up to and including
// the provided from height have already been generated. It also purchases the
Expand Down Expand Up @@ -1211,7 +1202,7 @@ func (g *chaingenHarness) generateToHeight(fromHeight, toHeight uint32, buyTicke
//
// genesis -> bfb -> bm2 -> bm3 -> ... -> bm#
alreadyAsserted := tipHeight >= coinbaseMaturity+1
targetHeight := minUint32(coinbaseMaturity+1, toHeight)
targetHeight := min(coinbaseMaturity+1, toHeight)
for ; tipHeight < targetHeight; tipHeight++ {
blockName := fmt.Sprintf("bm%d", tipHeight-intermediateHeight)
g.NextBlock(blockName, nil, nil)
Expand All @@ -1232,7 +1223,7 @@ func (g *chaingenHarness) generateToHeight(fromHeight, toHeight uint32, buyTicke
// ... -> bm# ... -> bse18 -> bse19 -> ... -> bse#
var ticketsPurchased uint32
alreadyAsserted = tipHeight >= stakeEnabledHeight
targetHeight = minUint32(stakeEnabledHeight, toHeight)
targetHeight = min(stakeEnabledHeight, toHeight)
for ; tipHeight < targetHeight; tipHeight++ {
var ticketOuts []chaingen.SpendableOut
if buyTicketsPerBlock > 0 {
Expand All @@ -1259,7 +1250,7 @@ func (g *chaingenHarness) generateToHeight(fromHeight, toHeight uint32, buyTicke
var ticketOuts []chaingen.SpendableOut
// Only purchase tickets until the target ticket pool size is reached.
ticketsNeeded := targetPoolSize - ticketsPurchased
ticketsNeeded = minUint32(ticketsNeeded, buyTicketsPerBlock)
ticketsNeeded = min(ticketsNeeded, buyTicketsPerBlock)
if ticketsNeeded > 0 {
outs := g.OldestCoinbaseOuts()
ticketOuts = outs[1 : ticketsNeeded+1]
Expand Down
13 changes: 2 additions & 11 deletions internal/mining/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2014-2016 The btcsuite developers
// Copyright (c) 2016-2022 The Decred developers
// Copyright (c) 2016-2026 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -42,15 +42,6 @@ type Policy struct {
StandardVerifyFlags func() (txscript.ScriptFlags, error)
}

// minInt is a helper function to return the minimum of two ints. This avoids
// a math import and the need to cast to floats.
func minInt(a, b int) int {
if a < b {
return a
}
return b
}

// calcInputValueAge is a helper function used to calculate the input age of
// a transaction. The input age for a txin is the number of confirmations
// since the referenced txout multiplied by its output value. The total input
Expand Down Expand Up @@ -113,7 +104,7 @@ func CalcPriority(tx *wire.MsgTx, prioInputs PriorityInputser, nextBlockHeight i
overhead := 0
for _, txIn := range tx.TxIn {
// Max inputs + size can't possibly overflow here.
overhead += 58 + minInt(110, len(txIn.SignatureScript))
overhead += 58 + min(110, len(txIn.SignatureScript))
}

serializedTxSize := tx.SerializeSize()
Expand Down
40 changes: 11 additions & 29 deletions internal/rpcserver/rpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4001,30 +4001,12 @@ func handleGetWorkRequest(ctx context.Context, s *Server) (any, error) {
return reply, nil
}

// minInt is a helper function to return the minimum of two ints. This avoids
// the need to cast to floats.
func minInt(a, b int) int {
if a < b {
return a
}
return b
}

// maxInt is a helper function to return the maximum of two ints. This avoids
// the need to cast to floats.
func maxInt(a, b int) int {
if a > b {
return a
}
return b
}

// handleGetWorkSubmission is a helper for handleGetWork which deals with
// the calling submitting work to be verified and processed.
func handleGetWorkSubmission(_ context.Context, s *Server, hexData string) (any, error) {
// Ensure the provided data is sane.
minDataLen := minInt(getworkDataLenBlake256, getworkDataLenBlake3)
maxDataLen := maxInt(getworkDataLenBlake256, getworkDataLenBlake3)
minDataLen := min(getworkDataLenBlake256, getworkDataLenBlake3)
maxDataLen := max(getworkDataLenBlake256, getworkDataLenBlake3)
paddedHexDataLen := len(hexData) + len(hexData)%2
if paddedHexDataLen < minDataLen*2 || paddedHexDataLen > maxDataLen*2 {
if minDataLen == maxDataLen {
Expand Down Expand Up @@ -4613,8 +4595,8 @@ func handleSubmitBlock(_ context.Context, s *Server, cmd any) (any, error) {
return nil, nil
}

// min gets the minimum amount from a slice of amounts.
func min(s []dcrutil.Amount) dcrutil.Amount {
// minAmount gets the minimum amount from a slice of amounts.
func minAmount(s []dcrutil.Amount) dcrutil.Amount {
if len(s) == 0 {
return 0
}
Expand All @@ -4630,7 +4612,7 @@ func min(s []dcrutil.Amount) dcrutil.Amount {
}

// max gets the maximum amount from a slice of amounts.
func max(s []dcrutil.Amount) dcrutil.Amount {
func maxAmount(s []dcrutil.Amount) dcrutil.Amount {
max := dcrutil.Amount(0)
for i := range s {
if s[i] > max {
Expand Down Expand Up @@ -4708,8 +4690,8 @@ func feeInfoForMempool(s *Server, txType stake.TxType) *types.FeeInfoMempool {

return &types.FeeInfoMempool{
Number: uint32(len(ticketFees)),
Min: min(ticketFees).ToCoin(),
Max: max(ticketFees).ToCoin(),
Min: minAmount(ticketFees).ToCoin(),
Max: maxAmount(ticketFees).ToCoin(),
Mean: mean(ticketFees).ToCoin(),
Median: median(ticketFees).ToCoin(),
StdDev: stdDev(ticketFees).ToCoin(),
Expand Down Expand Up @@ -4776,8 +4758,8 @@ func ticketFeeInfoForBlock(s *Server, height int64, txType stake.TxType) (*types
return &types.FeeInfoBlock{
Height: uint32(height),
Number: uint32(txNum),
Min: min(txFees).ToCoin(),
Max: max(txFees).ToCoin(),
Min: minAmount(txFees).ToCoin(),
Max: maxAmount(txFees).ToCoin(),
Mean: mean(txFees).ToCoin(),
Median: median(txFees).ToCoin(),
StdDev: stdDev(txFees).ToCoin(),
Expand Down Expand Up @@ -4823,8 +4805,8 @@ func ticketFeeInfoForRange(s *Server, start int64, end int64, txType stake.TxTyp
StartHeight: uint32(start),
EndHeight: uint32(end),
Number: uint32(len(txFees)),
Min: min(txFees).ToCoin(),
Max: max(txFees).ToCoin(),
Min: minAmount(txFees).ToCoin(),
Max: maxAmount(txFees).ToCoin(),
Mean: mean(txFees).ToCoin(),
Median: median(txFees).ToCoin(),
StdDev: stdDev(txFees).ToCoin(),
Expand Down