restruct

Qitmeer · Nov 30, 2023 · 19e6128 · 19e6128
1 parent aedc031
commit 19e6128
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 67 deletions.
diff --git a/common/util/math/min.go → common/math/maxmin.go b/common/util/math/min.go → common/math/maxmin.go
@@ -9,7 +9,7 @@ func MinInt(x, y int) int {
 }
 
 // MaxInt64 returns the bigger of x or y.
-func MaxInt64(x, y int64) int64 {
+func MaxInt64Val(x, y int64) int64 {
 	if x > y {
 		return x
 	}

diff --git a/common/util/math/min_test.go b/common/util/math/min_test.go
diff --git a/core/types/pow/difficultymanager/difficultymanager.go b/core/types/pow/difficultymanager/difficultymanager.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/Qitmeer/qng/common/util/math"
+	"github.com/Qitmeer/qng/common/math"
 	"github.com/Qitmeer/qng/core/types/pow"
 	"github.com/Qitmeer/qng/params"
 )
@@ -66,7 +66,7 @@ func (dm *difficultyManager) requiredDifficultyFromTargetsWindow(targetsWindow B
 	newTarget := targetsWindow.AverageTarget()
 	newTarget.
 		// We need to clamp the timestamp difference to 1 so that we'll never get a 0 target.
-		Mul(newTarget, div.SetInt64(math.MaxInt64(windowMaxTimeStamp-windowMinTimestamp, 1))).
+		Mul(newTarget, div.SetInt64(math.MaxInt64Val(windowMaxTimeStamp-windowMinTimestamp, 1))).
 		Div(newTarget, div.SetInt64(dm.targetTimePerBlock.Milliseconds())).
 		Div(newTarget, div.SetUint64(uint64(len(targetsWindow))))
 	if newTarget.Cmp(dm.powMax) > 0 {