diff --git a/contractcourt/commit_sweep_resolver.go b/contractcourt/commit_sweep_resolver.go index 55ee08e5d8..612e293eaf 100644 --- a/contractcourt/commit_sweep_resolver.go +++ b/contractcourt/commit_sweep_resolver.go @@ -4,7 +4,6 @@ import ( "encoding/binary" "fmt" "io" - "math" "sync" "github.com/btcsuite/btcd/btcutil" @@ -391,9 +390,7 @@ func (c *commitSweepResolver) Launch() error { // expires after. unlockHeight := confHeight + c.commitResolution.MaturityDelay if c.hasCLTV() { - unlockHeight = uint32(math.Max( - float64(unlockHeight), float64(c.leaseExpiry), - )) + unlockHeight = max(unlockHeight, c.leaseExpiry) } // Update report now that we learned the confirmation height. diff --git a/contractcourt/htlc_lease_resolver.go b/contractcourt/htlc_lease_resolver.go index 6230f96777..8f97b68045 100644 --- a/contractcourt/htlc_lease_resolver.go +++ b/contractcourt/htlc_lease_resolver.go @@ -1,8 +1,6 @@ package contractcourt import ( - "math" - "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/chainntnfs" "github.com/lightningnetwork/lnd/channeldb" @@ -42,9 +40,7 @@ func (h *htlcLeaseResolver) deriveWaitHeight(csvDelay uint32, waitHeight := uint32(commitSpend.SpendingHeight) + csvDelay - 1 if h.hasCLTV() { - waitHeight = uint32(math.Max( - float64(waitHeight), float64(h.leaseExpiry), - )) + waitHeight = max(waitHeight, h.leaseExpiry) } return waitHeight diff --git a/lnwallet/channel.go b/lnwallet/channel.go index 6486464d0f..65abfba2bf 100644 --- a/lnwallet/channel.go +++ b/lnwallet/channel.go @@ -7,7 +7,6 @@ import ( "crypto/sha256" "errors" "fmt" - "math" "slices" "sync" @@ -9512,7 +9511,7 @@ func (lc *LightningChannel) MaxFeeRate( // rather than us decreasing in local balance. The max fee rate is // always floored by the current fee rate of the channel. idealMaxFee := float64(baseBalance) * maxAllocation - maxFee := math.Max(float64(currentFee), idealMaxFee) + maxFee := max(float64(currentFee), idealMaxFee) maxFeeAllocation := maxFee / float64(baseBalance) maxFeeRate := chainfee.SatPerKWeight(maxFee / (float64(weight) / 1000)) @@ -9539,15 +9538,12 @@ func (lc *LightningChannel) IdealCommitFeeRate(netFeeRate, minRelayFeeRate, maxFeeRate > maxAnchorCommitFeeRate { case true: commitFeeRate = chainfee.SatPerKWeight( - math.Min( - float64(netFeeRate), - float64(maxAnchorCommitFeeRate), - ), + min(netFeeRate, maxAnchorCommitFeeRate), ) case false: commitFeeRate = chainfee.SatPerKWeight( - math.Min(float64(netFeeRate), float64(maxFeeRate)), + min(netFeeRate, maxFeeRate), ) } diff --git a/sqldb/interfaces.go b/sqldb/interfaces.go index 1c5b4878fb..3197d7f092 100644 --- a/sqldb/interfaces.go +++ b/sqldb/interfaces.go @@ -183,7 +183,7 @@ func randRetryDelay(initialRetryDelay, maxRetryDelay time.Duration, // attempt. If we double something n times, that's the same as // multiplying the value with 2^n. We limit the power to 32 to avoid // overflows. - factor := time.Duration(math.Pow(2, math.Min(float64(attempt), 32))) + factor := time.Duration(math.Pow(2, min(float64(attempt), 32))) actualDelay := initialDelay * factor // Cap the delay at the maximum configured value.