remove unuse code

Qitmeer · Dec 11, 2023 · ce9c333 · ce9c333
1 parent 04946b4
commit ce9c333
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 29 deletions.
diff --git a/consensus/model/block.go b/consensus/model/block.go
@@ -9,4 +9,5 @@ type Block interface {
 	GetOrder() uint
 	HasParents() bool
 	GetMainParent() uint
+	GetHeight() uint
 }
diff --git a/consensus/model/difficulty_manager.go b/consensus/model/difficulty_manager.go
@@ -10,7 +10,6 @@ import (
 // DifficultyManager provides a method to resolve the
 // difficulty value of a block
 type DifficultyManager interface {
-	CalcNextRequiredDifficulty(timestamp time.Time, powType pow.PowType) (uint32, error)
 	RequiredDifficulty(block Block, newBlockTime time.Time, powInstance pow.IPow) (uint32, error)
 	CalcEasiestDifficulty(bits uint32, duration time.Duration, powInstance pow.IPow) uint32
 	GetCurrentPowDiff(ib Block, powType pow.PowType) *big.Int

diff --git a/core/blockchain/difficulty.go b/core/blockchain/difficulty.go
@@ -33,7 +33,7 @@ func (m *BlockChain) calcNextRequiredDifficulty(block model.Block, newBlockTime
 // This function is safe for concurrent access.
 func (b *BlockChain) CalcNextRequiredDifficulty(timestamp time.Time, powType pow.PowType) (uint32, error) {
 	b.ChainRLock()
-	block := b.GetMainChainTip()
+	block := b.bd.GetMainChainTip()
 	instance := pow.GetInstance(powType, 0, []byte{})
 	instance.SetParams(b.params.PowConfig)
 	instance.SetMainHeight(pow.MainHeight(block.GetHeight() + 1))

diff --git a/core/types/pow/difficultymanager/kaspad.go b/core/types/pow/difficultymanager/kaspad.go
@@ -108,17 +108,6 @@ func (m *kaspadDiff) CalcEasiestDifficulty(bits uint32, duration time.Duration,
 	return pow.BigToCompact(newTarget)
 }
 
-func (m *kaspadDiff) CalcNextRequiredDifficulty(timestamp time.Time, powType pow.PowType) (uint32, error) {
-	m.b.ChainRLock()
-	block := m.b.GetMainChainTip()
-	instance := pow.GetInstance(powType, 0, []byte{})
-	instance.SetParams(m.cfg.PowConfig)
-	instance.SetMainHeight(pow.MainHeight(block.GetHeight() + 1))
-	difficulty, err := m.RequiredDifficultyByWindows(m.getblockWindows(block, instance.GetPowType(), int(m.cfg.WorkDiffWindowSize)))
-	m.b.ChainRUnlock()
-	return difficulty, err
-}
-
 func (m *kaspadDiff) RequiredDifficulty(block model.Block, newBlockTime time.Time, powInstance pow.IPow) (uint32, error) {
 	return m.RequiredDifficultyByWindows(m.getblockWindows(block, powInstance.GetPowType(), int(m.cfg.WorkDiffWindowSize)))
 }

diff --git a/core/types/pow/difficultymanager/meer.go b/core/types/pow/difficultymanager/meer.go
@@ -396,22 +396,6 @@ func (m *meerDiff) getDistanceFromLastAdjustment(block model.Block, powType pow.
 	}
 }
 
-// CalcNextRequiredDifficulty calculates the required difficulty for the block
-// after the end of the current best chain based on the difficulty retarget
-// rules.
-//
-// This function is safe for concurrent access.
-func (m *meerDiff) CalcNextRequiredDifficulty(timestamp time.Time, powType pow.PowType) (uint32, error) {
-	m.b.ChainRLock()
-	block := m.b.GetMainChainTip()
-	instance := pow.GetInstance(powType, 0, []byte{})
-	instance.SetParams(m.cfg.PowConfig)
-	instance.SetMainHeight(pow.MainHeight(block.GetHeight() + 1))
-	difficulty, err := m.RequiredDifficulty(block, timestamp, instance)
-	m.b.ChainRUnlock()
-	return difficulty, err
-}
-
 // find block node by pow type
 func (m *meerDiff) getPowTypeNode(block model.Block, powType pow.PowType) model.Block {
 	for {