Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-1413] Remove Handlers from Consensus (#947)

Browse Source 
* [NOD-1413] Remove Handlers from Consensus.

* [NOD-1413] Remove ResolveFinalityConflicts.
This commit is contained in:
stasatdaglabs 2020-10-06 16:35:47 +03:00 committed by GitHub
parent 62ddd8fe1c
commit 9181481fc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
domain/consensus/consensus.go
View File

@ -5,7 +5,6 @@ import (
"github.com/kaspanet/kaspad/domain/consensus/model"
"github.com/kaspanet/kaspad/domain/consensus/processes"
"github.com/kaspanet/kaspad/util"
"github.com/kaspanet/kaspad/util/daghash"
)
// Consensus maintains the current core state of the node
@ -14,12 +13,6 @@ type Consensus interface {
ValidateAndInsertBlock(block *appmessage.MsgBlock) error
UTXOByOutpoint(outpoint *appmessage.Outpoint) *model.UTXOEntry
ValidateTransaction(transaction *util.Tx, utxoEntries []*model.UTXOEntry) error
ResolveFinalityConflict(newFinalityBlockHash *daghash.Hash)
SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler model.OnBlockAddedToDAGHandler)
SetOnChainChangedHandler(onChainChangedHandler model.OnChainChangedHandler)
SetOnFinalityConflictHandler(onFinalityConflictHandler model.OnFinalityConflictHandler)
SetOnFinalityConflictResolvedHandler(onFinalityConflictResolvedHandler model.OnFinalityConflictResolvedHandler)
}
type consensus struct {
@ -51,29 +44,3 @@ func (s *consensus) UTXOByOutpoint(outpoint *appmessage.Outpoint) *model.UTXOEnt
func (s *consensus) ValidateTransaction(transaction *util.Tx, utxoEntries []*model.UTXOEntry) error {
return s.consensusStateManager.ValidateTransaction(transaction, utxoEntries)
}
// ResolveFinalityConflict resolves an existing finality conflict
// using the given finalityBlockHash
func (s *consensus) ResolveFinalityConflict(newFinalityBlockHash *daghash.Hash) {
s.consensusStateManager.ResolveFinalityConflict(newFinalityBlockHash)
}
// SetOnBlockAddedToDAGHandler set the onBlockAddedToDAGHandler for the consensus
func (s *consensus) SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler model.OnBlockAddedToDAGHandler) {
s.blockProcessor.SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler)
}
// SetOnChainChangedHandler set the onBlockAddedToDAGHandler for the consensus
func (s *consensus) SetOnChainChangedHandler(onChainChangedHandler model.OnChainChangedHandler) {
s.blockProcessor.SetOnChainChangedHandler(onChainChangedHandler)
}
// SetOnFinalityConflictHandler set the onBlockAddedToDAGHandler for the consensus
func (s *consensus) SetOnFinalityConflictHandler(onFinalityConflictHandler model.OnFinalityConflictHandler) {
s.blockProcessor.SetOnFinalityConflictHandler(onFinalityConflictHandler)
}
// SetOnFinalityConflictResolvedHandler set the onBlockAddedToDAGHandler for the consensus
func (s *consensus) SetOnFinalityConflictResolvedHandler(onFinalityConflictResolvedHandler model.OnFinalityConflictResolvedHandler) {
s.consensusStateManager.SetOnFinalityConflictResolvedHandler(onFinalityConflictResolvedHandler)
}

22
domain/consensus/model/handlers.go
View File

@ -1,22 +0,0 @@
package model
import (
"github.com/kaspanet/kaspad/app/appmessage"
"github.com/kaspanet/kaspad/util/daghash"
)
// OnBlockAddedToDAGHandler is a handler function for when a block
// has been successfully added to the DAG
type OnBlockAddedToDAGHandler func(block *appmessage.MsgBlock)
// OnChainChangedHandler is a handler function for when the virtual
// block's selected parent chain had changed
type OnChainChangedHandler func(removedChainBlockHashes []*daghash.Hash, addedChainBlockHashes []*daghash.Hash)
// OnFinalityConflictHandler is a handler function for when a
// conflict in finality occurs
type OnFinalityConflictHandler func(violatingBlockHash *daghash.Hash)
// OnFinalityConflictResolvedHandler is a handler function for when
// an existing finality conflict has been resolved
type OnFinalityConflictResolvedHandler func(finalityBlockHash *daghash.Hash)

15
domain/consensus/processes/blockprocessor/blockprocessor.go
View File

@ -69,18 +69,3 @@ func (bp *BlockProcessor) BuildBlock(coinbaseScriptPublicKey []byte, coinbaseExt
func (bp *BlockProcessor) ValidateAndInsertBlock(block *appmessage.MsgBlock) error {
return nil
}
// SetOnBlockAddedToDAGHandler set the onBlockAddedToDAGHandler for the block processor
func (bp *BlockProcessor) SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler model.OnBlockAddedToDAGHandler) {
}
// SetOnChainChangedHandler set the onBlockAddedToDAGHandler for the block processor
func (bp *BlockProcessor) SetOnChainChangedHandler(onChainChangedHandler model.OnChainChangedHandler) {
}
// SetOnFinalityConflictHandler set the onBlockAddedToDAGHandler for the block processor
func (bp *BlockProcessor) SetOnFinalityConflictHandler(onFinalityConflictHandler model.OnFinalityConflictHandler) {
}

13
domain/consensus/processes/consensusstatemanager/consensusstatemanager.go
View File

@ -6,7 +6,6 @@ import (
"github.com/kaspanet/kaspad/domain/consensus/model"
"github.com/kaspanet/kaspad/domain/dagconfig"
"github.com/kaspanet/kaspad/util"
"github.com/kaspanet/kaspad/util/daghash"
)
// ConsensusStateManager manages the node's consensus state
@ -49,15 +48,3 @@ func (csm *ConsensusStateManager) ValidateTransaction(transaction *util.Tx, utxo
func (csm *ConsensusStateManager) CalculateConsensusStateChanges(block *appmessage.MsgBlock) *model.ConsensusStateChanges {
return nil
}
// ResolveFinalityConflict resolves an existing finality conflict
// using the given newFinalityBlockHash
func (csm *ConsensusStateManager) ResolveFinalityConflict(newFinalityBlockHash *daghash.Hash) {
}
// SetOnFinalityConflictResolvedHandler set the onBlockAddedToDAGHandler for
// the consensus state manager
func (csm *ConsensusStateManager) SetOnFinalityConflictResolvedHandler(onFinalityConflictResolvedHandler model.OnFinalityConflictResolvedHandler) {
}

7
domain/consensus/processes/interfaces.go
View File

@ -12,10 +12,6 @@ import (
type BlockProcessor interface {
BuildBlock(coinbaseScriptPublicKey []byte, coinbaseExtraData []byte, transactionSelector model.TransactionSelector) *appmessage.MsgBlock
ValidateAndInsertBlock(block *appmessage.MsgBlock) error
SetOnBlockAddedToDAGHandler(onBlockAddedToDAGHandler model.OnBlockAddedToDAGHandler)
SetOnChainChangedHandler(onChainChangedHandler model.OnChainChangedHandler)
SetOnFinalityConflictHandler(onFinalityConflictHandler model.OnFinalityConflictHandler)
}
// BlockValidator exposes a set of validation classes, after which
@ -34,9 +30,6 @@ type ConsensusStateManager interface {
UTXOByOutpoint(outpoint *appmessage.Outpoint) *model.UTXOEntry
ValidateTransaction(transaction *util.Tx, utxoEntries []*model.UTXOEntry) error
CalculateConsensusStateChanges(block *appmessage.MsgBlock) *model.ConsensusStateChanges
ResolveFinalityConflict(newFinalityBlockHash *daghash.Hash)
SetOnFinalityConflictResolvedHandler(onFinalityConflictResolvedHandler model.OnFinalityConflictResolvedHandler)
}
// DAGTopologyManager exposes methods for querying relationships