remove unuse code

Qitmeer · Dec 11, 2023 · d94a47a · d94a47a
1 parent a8c673f
commit d94a47a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 35 deletions.
diff --git a/common/math/maxmin.go b/common/math/maxmin.go
diff --git a/core/types/common.go b/core/types/common.go
@@ -18,9 +18,4 @@ const (
 	// MaxAmount is the maximum transaction amount allowed in atoms.
 	// TODO, relocate the coin related item to chain's params
 	MaxAmount = 21e6 * AtomsPerCoin
-
-	// MEER difficulty adjustment
-	DIFFICULTY_MODE_MEER = 0
-	// KASPAD difficulty adjustment
-	DIFFICULTY_MODE_KASPAD
 )
diff --git a/core/types/pow/diff.go b/core/types/pow/diff.go
@@ -20,6 +20,13 @@ var (
 	OneLsh256 = new(big.Int).Lsh(bigOne, 256)
 )
 
+const (
+	// MEER difficulty adjustment
+	DIFFICULTY_MODE_MEER = 0
+	// KASPAD difficulty adjustment
+	DIFFICULTY_MODE_KASPAD
+)
+
 // HashToBig converts a hash.Hash into a big.Int that can be used to
 // perform math comparisons.
 func HashToBig(hash *hash.Hash) *big.Int {

diff --git a/core/types/pow/difficultymanager/difficultymanager.go b/core/types/pow/difficultymanager/difficultymanager.go
@@ -2,13 +2,13 @@ package difficultymanager
 
 import (
 	"github.com/Qitmeer/qng/consensus/model"
-	"github.com/Qitmeer/qng/core/types"
+	"github.com/Qitmeer/qng/core/types/pow"
 	"github.com/Qitmeer/qng/params"
 )
 
 func NewDiffManager(b model.BlockChain, cfg *params.Params) model.DifficultyManager {
 	switch cfg.PowConfig.DifficultyMode {
-	case types.DIFFICULTY_MODE_KASPAD:
+	case pow.DIFFICULTY_MODE_KASPAD:
 		return &kaspadDiff{
 			b:                              b,
 			powMax:                         cfg.PowConfig.MeerXKeccakV1PowLimit,

diff --git a/core/types/pow/difficultymanager/kaspad.go b/core/types/pow/difficultymanager/kaspad.go
@@ -1,11 +1,11 @@
 package difficultymanager
 
 import (
+	"math"
 	"math/big"
 	"time"
 
 	"github.com/Qitmeer/qng/common/hash"
-	"github.com/Qitmeer/qng/common/math"
 	"github.com/Qitmeer/qng/consensus/model"
 	"github.com/Qitmeer/qng/core/types"
 	"github.com/Qitmeer/qng/core/types/pow"
@@ -159,7 +159,7 @@ func (dm *kaspadDiff) requiredDifficultyFromTargetsWindow(targetsWindow blockWin
 	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.MaxInt64Val(windowMaxTimeStamp-windowMinTimestamp, 1))).
+		Mul(newTarget, div.SetInt64(int64(math.Max(float64(windowMaxTimeStamp-windowMinTimestamp), 1)))).
 		Div(newTarget, div.SetInt64(dm.targetTimePerBlock.Milliseconds())).
 		Div(newTarget, div.SetUint64(uint64(len(targetsWindow))))
 	if newTarget.Cmp(dm.powMax) > 0 {

diff --git a/params/params_mixnet.go b/params/params_mixnet.go
@@ -86,7 +86,7 @@ var MixNetParams = Params{
 		},
 		// after this height the big graph will be the main pow graph
 		AdjustmentStartMainHeight: 1440 * 15 / mixTargetTimePerBlock,
-		DifficultyMode:            types.DIFFICULTY_MODE_KASPAD,
+		DifficultyMode:            pow.DIFFICULTY_MODE_KASPAD,
 	},
 
 	WorkDiffAlpha:            1,